Bug fix in command classes names