Renamed map class