Some fixes to custom map names