Renamed main classes