Renamed Mapper classes