A little more map name consistency