Refactoring CLI commands with a proper naming convention