Names of Map and GameMap swapped