rename command name
renaming and reorganizing a little bit