Issue #218 -- appended "Command" at the end of class names