renaming Mapper classes