The keymap names still use the label, so use that again for looking up the keymap so things work again after recent changes.