Renamed all command classes to look nicer