Merge "Keyboard shortcuts: minor naming refactor"