More tweaks to chosen map names