Renamed commands to not use full classname.