Merge pull request #4374 from RemiNV/map_type_rename