Cleanup on name generation for map files.