rename old map, typedef new map