renaming some shortcuts to be more uniform in conventions