Merge "Rename map names in read_mapinfo"