ticket #41: clean up map names slightly