Fix map name issues