Relax constraints on map name parsing

It now only need be a name that does not contain a comma.