Rename some command classes for unification