Refactoring
Renamed the mapper class