Renames Mappers, removes Interfaces