improved map name handling