Fix issue with map not being saved correctly

fix MapMapper issue
renames