Allow spaces in map name