Renamed commands to not use command class name.