Second batch of renaming and sorting of the hotkey enumeration.