refactored the name of mapper class