Renaming to new convention
Fixing keybindings