Fixed classes names and undo command mutation