Index: /trunk/data/maps.xsd
===================================================================
--- /trunk/data/maps.xsd	(revision 13756)
+++ /trunk/data/maps.xsd	(revision 13757)
@@ -117,5 +117,5 @@
                     <xs:attribute name="name" type="xs:string" use="optional" />
                     <xs:attribute name="style" type="xs:string" use="optional" />
-                    <xs:attribute name="tileMatrixSet" type="xs:string" use="optional" />
+                    <xs:attribute name="tile-matrix-set" type="xs:string" use="optional" />
                 </xs:complexType>
             </xs:element>
@@ -725,5 +725,5 @@
                             <!-- old unused feature, ignored -->
                             <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-                            <xs:element name="defaultLayers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
+                            <xs:element name="default-layers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
                             <xs:element name="custom-http-header" minOccurs="0" maxOccurs="unbounded">
                                 <xs:complexType>
Index: /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java	(revision 13756)
+++ /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java	(revision 13757)
@@ -258,5 +258,5 @@
                     metadataHeaders.put(atts.getValue("header-name"), atts.getValue("metadata-key"));
                     newState = State.METADATA;
-                } else if ("defaultLayers".equals(qName)) {
+                } else if ("default-layers".equals(qName)) {
                     newState = State.DEFAULT_LAYERS;
                 } else if ("custom-http-header".equals(qName)) {
@@ -294,5 +294,5 @@
                             atts.getValue("name"),
                             atts.getValue("style"),
-                            atts.getValue("tileMatrixSet")
+                            atts.getValue("tile-matrix-set")
                             ));
                 }
Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 13756)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java	(revision 13757)
@@ -64,7 +64,7 @@
                 "<max-zoom>18</max-zoom>\n" +
                 "<valid-georeference>true</valid-georeference>\n" +
-                "<defaultLayers>" +
+                "<default-layers>" +
                 "<layer name=\"single_node_in_way\" style=\"default\" />" +
-                "</defaultLayers>" +
+                "</default-layers>" +
                 "</entry>\n" +
                 "</imagery>"
Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 13756)
+++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 13757)
@@ -370,7 +370,7 @@
                 "<type>wmts</type>\n" +
                 "<url><![CDATA[" + tileServer.url("/getcapabilities.xml") + "]]></url>\n" +
-                "<defaultLayers>" +
+                "<default-layers>" +
                 "<layer name=\"GEOGRAPHICALGRIDSYSTEMS.MAPS\" />" +
-                "</defaultLayers>" +
+                "</default-layers>" +
                 "</entry>\n" +
                 "</imagery>"