Fixed map names