Change sub-syntax names for clarity. Add keyboard shortcut.