Renamed classes and commands.