Rename "command" classes to use consistent naming