diff --git a/pkg/maps/4UMaps.xml b/pkg/maps/4UMaps.xml
index 1df217ed..980e1ea0 100644
--- a/pkg/maps/4UMaps.xml
+++ b/pkg/maps/4UMaps.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>4UMaps</name>
 	<url>http://4umaps.eu/$z/$x/$y.png</url>
+	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
 	<zoom min="2" max="15"/>
 	<bounds bottom="-65"/>
-	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
 </map>
diff --git a/pkg/maps/OpenStreetMap.xml b/pkg/maps/OpenStreetMap.xml
index bd269deb..9b030aa8 100644
--- a/pkg/maps/OpenStreetMap.xml
+++ b/pkg/maps/OpenStreetMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>Open Street Map</name>
 	<url>http://tile.openstreetmap.org/$z/$x/$y.png</url>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © OpenStreetMap (CC-BY-SA)</copyright>
diff --git a/pkg/maps/OpenTopoMap.xml b/pkg/maps/OpenTopoMap.xml
index 0385cecc..88d0731c 100644
--- a/pkg/maps/OpenTopoMap.xml
+++ b/pkg/maps/OpenTopoMap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>Open Topo Map</name>
 	<url>https://a.tile.opentopomap.org/$z/$x/$y.png</url>
-	<zoom max="17"/>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL), SRTM | Rendering: © OpenTopoMap (CC-BY-SA)</copyright>
+	<zoom max="17"/>
 </map>
diff --git a/pkg/maps/USGS-imagery.xml b/pkg/maps/USGS-imagery.xml
index abba390d..a045938f 100644
--- a/pkg/maps/USGS-imagery.xml
+++ b/pkg/maps/USGS-imagery.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>USGS Imagery</name>
 	<url>https://navigator.er.usgs.gov/tiles/aerial_Imagery.cgi/$z/$x/$y</url>
+	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
 	<zoom min="2" max="15"/>
 	<bounds bottom="0" top="74"/>
-	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
 </map>
diff --git a/pkg/maps/USGS-topo.xml b/pkg/maps/USGS-topo.xml
index 643c777a..162d90bf 100644
--- a/pkg/maps/USGS-topo.xml
+++ b/pkg/maps/USGS-topo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map>
+<map xmlns="http://www.gpxsee.org/map/1">
 	<name>USGS Topo</name>
 	<url>https://navigator.er.usgs.gov/tiles/tcr.cgi/$z/$x/$y.png</url>
-	<zoom min="2" max="15"/>
 	<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
+	<zoom min="2" max="15"/>
 </map>
diff --git a/src/map/mapsource.cpp b/src/map/mapsource.cpp
index b163ef5d..b4944e6a 100644
--- a/src/map/mapsource.cpp
+++ b/src/map/mapsource.cpp
@@ -13,7 +13,7 @@
 #define BOUNDS_BOTTOM  -85.0511
 
 
-MapSource::Config::Config() : type(TMS), zooms(ZOOM_MIN, ZOOM_MAX),
+MapSource::Config::Config() : type(OSM), zooms(ZOOM_MIN, ZOOM_MAX),
   bounds(Coordinates(BOUNDS_LEFT, BOUNDS_TOP), Coordinates(BOUNDS_RIGHT,
   BOUNDS_BOTTOM)), format("image/png"), rest(false) {}
 
@@ -119,7 +119,7 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
 {
 	const QXmlStreamAttributes &attr = reader.attributes();
 	config.type = (attr.value("type") == "WMTS") ? WMTS
-	  : (attr.value("type") == "WMS") ? WMS : TMS;
+	  : (attr.value("type") == "WMS") ? WMS : OSM;
 
 	while (reader.readNextStartElement()) {
 		if (reader.name() == "name")
diff --git a/src/map/mapsource.h b/src/map/mapsource.h
index bf368881..ef60eb1e 100644
--- a/src/map/mapsource.h
+++ b/src/map/mapsource.h
@@ -18,7 +18,7 @@ public:
 
 private:
 	enum Type {
-		TMS,
+		OSM,
 		WMTS,
 		WMS
 	};