Renaming and a slight move of commands!