Refactoring command and response class names