Renamed some classes