Label changes in admin broken by previous change, now fixed
Merge in upstream changes for keyboard-name-on-create
Merge pull request #294 from jvc26/fix-rename-in-admin

Label changes in admin broken by previous change, now fixed