Fix map names with dashes