diff --git a/api/custom-map-ui/bootstrap-ui.html b/api/custom-map-ui/bootstrap-ui.html
index c75b250..df0e0e6 100644
--- a/api/custom-map-ui/bootstrap-ui.html
+++ b/api/custom-map-ui/bootstrap-ui.html
@@ -45,9 +45,9 @@ <h3>Layers</h3>
         <figure>
           <mapml-viewer id="custom-map" style="width:500px;height: 500px;" projection="CBMTILE" zoom="0" lat="47"
             lon="-92">
-            <layer- label="Canada Base Map - Geometry" src="../../refactoring-temporary/cbmtgeom.mapml" checked>
-            </layer->
-            <layer- label="Fire Danger (forecast)" src="../../refactoring-temporary/fdi.mapml"></layer->
+            <map-layer label="Canada Base Map - Geometry" src="../../refactoring-temporary/cbmtgeom.mapml" checked>
+            </map-layer>
+            <map-layer label="Fire Danger (forecast)" src="../../refactoring-temporary/fdi.mapml"></map-layer>
           </mapml-viewer>
 
           <figcaption class="map-controls">
diff --git a/api/custom-map-ui/custom-css-ui.html b/api/custom-map-ui/custom-css-ui.html
index c75b250..df0e0e6 100644
--- a/api/custom-map-ui/custom-css-ui.html
+++ b/api/custom-map-ui/custom-css-ui.html
@@ -45,9 +45,9 @@ <h3>Layers</h3>
         <figure>
           <mapml-viewer id="custom-map" style="width:500px;height: 500px;" projection="CBMTILE" zoom="0" lat="47"
             lon="-92">
-            <layer- label="Canada Base Map - Geometry" src="../../refactoring-temporary/cbmtgeom.mapml" checked>
-            </layer->
-            <layer- label="Fire Danger (forecast)" src="../../refactoring-temporary/fdi.mapml"></layer->
+            <map-layer label="Canada Base Map - Geometry" src="../../refactoring-temporary/cbmtgeom.mapml" checked>
+            </map-layer>
+            <map-layer label="Fire Danger (forecast)" src="../../refactoring-temporary/fdi.mapml"></map-layer>
           </mapml-viewer>
 
           <figcaption class="map-controls">
diff --git a/api/custom-map-ui/custom-ui.js b/api/custom-map-ui/custom-ui.js
index 478166a..2902b85 100644
--- a/api/custom-map-ui/custom-ui.js
+++ b/api/custom-map-ui/custom-ui.js
@@ -1,13 +1,13 @@
 CustomUI = {
   initialize: function () {
-    let layers = document.querySelectorAll("layer-");
+    let layers = document.querySelectorAll("map-layer");
     let map = document.querySelector("mapml-viewer");
 
     let mapObserver = new MutationObserver((m) => {
       m.forEach((mut) => {
         if (mut.type === "childList") {
           mut.addedNodes.forEach((l) => {
-            if (l.tagName === "LAYER-") {
+            if (l.tagName === "MAP-LAYER") {
               CustomUI.addLayer(l);
             }
           });
diff --git a/api/custom-map-ui/geolocation-search-ui.html b/api/custom-map-ui/geolocation-search-ui.html
index e52639c..b8809d1 100644
--- a/api/custom-map-ui/geolocation-search-ui.html
+++ b/api/custom-map-ui/geolocation-search-ui.html
@@ -25,7 +25,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
+        <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></map-layer>
     </mapml-viewer>
     
     <script>
diff --git a/api/custom-map-ui/geoname-search-ui.html b/api/custom-map-ui/geoname-search-ui.html
index d168ba9..27922a4 100644
--- a/api/custom-map-ui/geoname-search-ui.html
+++ b/api/custom-map-ui/geoname-search-ui.html
@@ -26,7 +26,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
+        <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></map-layer>
     </mapml-viewer>
     
     <script>
diff --git a/api/geojson/index.html b/api/geojson/index.html
index 2a44943..721cd66 100644
--- a/api/geojson/index.html
+++ b/api/geojson/index.html
@@ -100,7 +100,7 @@
          vertical-align: middle;
        } 
         
-       /* Pre-style to avoid FOUC of inline layer- and fallback content. */ 
+       /* Pre-style to avoid FOUC of inline map-layer and fallback content. */ 
        mapml-viewer:not(:defined) > * { 
          display: none; 
        } 
@@ -116,7 +116,7 @@
        supported, or if javascript is disabled. This needs to be defined separately 
        from the above, because the `:not(:defined)` selector invalidates the entire 
        declaration in browsers that do not support it. */ 
-       layer- { 
+       map-layer { 
          display: none; 
        } 
      </style> 
@@ -124,7 +124,7 @@
        <style> 
          /* Ensure fallback content (children of the map element) is displayed if 
          custom/built-in elements is supported but javascript is disabled. */ 
-         mapml-viewer:not(:defined) > :not(layer-) { 
+         mapml-viewer:not(:defined) > :not(map-layer) { 
            display: initial; 
          } 
          
@@ -140,14 +140,14 @@
   </head>
   <body>
     <mapml-viewer projection="OSMTILE" zoom="2" lat="45" lon="-90" controls>
-      <layer- label="United States - The National Map" checked>
+      <map-layer label="United States - The National Map" checked>
         <map-extent units="OSMTILE" checked hidden>
           <map-input name="TileMatrix" type="zoom" value="18" min="0" max="16"></map-input>
           <map-input name="TileCol" type="location" units="tilematrix" axis="column" min="0" max="262144"></map-input>
           <map-input name="TileRow" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
           <map-link rel="tile" tref="https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{TileMatrix}/{TileRow}/{TileCol}"></map-link>
         </map-extent>
-      </layer->
+      </map-layer>
     </mapml-viewer>
   <script src="https://leafletjs.com/examples/choropleth/us-states.js"></script>
 <script src="canada.js"></script>
diff --git a/api/map-feature/index.html b/api/map-feature/index.html
index 93fc831..2d2df72 100644
--- a/api/map-feature/index.html
+++ b/api/map-feature/index.html
@@ -100,7 +100,7 @@
         document.querySelector('map-feature').zoomTo();
       }
       function removeMan() {
-        document.querySelector('layer-[label="Two Hat Man"]').remove();
+        document.querySelector('map-layer[label="Two Hat Man"]').remove();
         toggleDisabled();
       }
     </script>
@@ -108,9 +108,9 @@
       <map-meta name="projection" content="OSMTILE"></map-meta>
     </template>
     <template id="empty-layer">
-      <layer-  label="Empty" checked>
+      <map-layer  label="Empty" checked>
         <map-meta name="projection" content="OSMTILE"></map-meta>
-      </layer->
+      </map-layer>
     </template>
     
     <template id="hatman">
@@ -143,10 +143,10 @@
 
     
     <mapml-viewer projection="OSMTILE" zoom="1" lat="0" lon="0" controls>
-      <layer- label="OSM" src="../../refactoring-temporary/osm.mapml" checked></layer->
-<!--      <layer- id="target-layer" label="Empty" checked>
+      <map-layer label="OSM" src="../../refactoring-temporary/osm.mapml" checked></map-layer>
+<!--      <map-layer id="target-layer" label="Empty" checked>
         <map-meta name="projection" content="OSMTILE"></map-meta>
-      </layer->-->
+      </map-layer>-->
     </mapml-viewer>
   <button id="add" onclick="_doMan('add')">Add feature</button>
     <button id="focus" disabled onclick="_doMan('focus')">Focus feature</button>
diff --git a/api/pwa/file-handling/README.md b/api/pwa/file-handling/README.md
index 2da2531..64d02a5 100644
--- a/api/pwa/file-handling/README.md
+++ b/api/pwa/file-handling/README.md
@@ -132,7 +132,7 @@ In this post, we will not dive into all the details, so I will just show the sni
 ...
 // Create the map with one layer
 <mapml-viewer zoom="2" lat="0" lon="0" controls controlslist="geolocation">
-  <layer- label="OpenStreetMap" checked >
+  <map-layer label="OpenStreetMap" checked >
     <map-link rel="license" href="https://www.openstreetmap.org/copyright" title="© OpenStreetMap contributors CC BY-SA"></map-link>
     <map-extent units="OSMTILE" checked>
       <map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
@@ -140,7 +140,7 @@ In this post, we will not dive into all the details, so I will just show the sni
       <map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
       <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
     </map-extent>
-  </layer->
+  </map-layer>
 </mapml-viewer>
 ...
 ```
diff --git a/api/pwa/file-handling/src/main-app.js b/api/pwa/file-handling/src/main-app.js
index e793967..0fe9879 100644
--- a/api/pwa/file-handling/src/main-app.js
+++ b/api/pwa/file-handling/src/main-app.js
@@ -135,7 +135,7 @@ mapml-viewer {
 <label for="loadfile">Load GeoJSON</label>
 </div>
 <mapml-viewer zoom="2" lat="0" lon="0" controls controlslist="geolocation">
-  <layer- label="OpenStreetMap" checked >
+  <map-layer label="OpenStreetMap" checked >
     <map-link rel="license" href="https://www.openstreetmap.org/copyright" title="© OpenStreetMap contributors CC BY-SA"></map-link>
     <map-extent units="OSMTILE" checked>
       <map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
@@ -143,7 +143,7 @@ mapml-viewer {
       <map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
       <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
     </map-extent>
-  </layer->
+  </map-layer>
 </mapml-viewer>
 <a class="credits" href="https://www.flaticon.com/free-icons/parchment" title="parchment icons">Parchment icons created by Freepik - Flaticon</a>
 </div>
diff --git a/change-projection/default-projection/index.html b/change-projection/default-projection/index.html
index 667f204..f330908 100644
--- a/change-projection/default-projection/index.html
+++ b/change-projection/default-projection/index.html
@@ -23,7 +23,7 @@
   </head>
   <body>
     <mapml-viewer zoom="5" lon="-97.288195" lat="56.555669"  controls>
-    <layer- checked>
+    <map-layer checked>
       <map-meta name="extent" content="top-left-easting=-19959237, top-left-northing=13854059, bottom-right-easting=-1174073, bottom-right-northing=4647371"></map-meta>
       <map-title>Topo base</map-title>
       <map-extent units="OSMTILE" label="Toprama - Mercator" checked>
@@ -41,8 +41,8 @@
           <map-input name="y" type="location" units="tilematrix" axis="row"></map-input>
           <map-input name="x" type="location" units="tilematrix" axis="column"></map-input>
           <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT3978/MapServer/tile/{z}/{y}/{x}?m4h=t" ></map-link>
-        </map-extent>        </layer->
-      <layer- label="Projection not specified"  checked>
+        </map-extent>        </map-layer>
+      <map-layer label="Projection not specified"  checked>
       <map-feature zoom="14">
         <map-featurecaption>Copied OSMTILE pcrs location</map-featurecaption>
         <map-properties>
@@ -55,7 +55,7 @@ <h2>Copied OSMTILE pcrs location</h2>
           </map-point>
         </map-geometry>
       </map-feature>
-      </layer->
+      </map-layer>
     </mapml-viewer>
 </body>
 </html>
diff --git a/change-projection/projection-extent-fallback/index.html b/change-projection/projection-extent-fallback/index.html
index de7395e..7379d97 100644
--- a/change-projection/projection-extent-fallback/index.html
+++ b/change-projection/projection-extent-fallback/index.html
@@ -32,7 +32,7 @@
   </head>
   <body>
     <mapml-viewer zoom="4" lon="-97.288195" lat="56.555669"  controls projection="OSMTILE">
-      <layer- label="Projection changer"  checked>
+      <map-layer label="Projection changer"  checked>
         <map-extent label="CBMT - Mercator" checked units="OSMTILE" >
           <map-input name="z" type="zoom" value="15" min="0" max="15"></map-input>
           <map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="32768"></map-input>
@@ -46,7 +46,7 @@
           <map-input name="x" type="location" units="tilematrix" axis="column"></map-input>
           <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT3978/MapServer/tile/{z}/{y}/{x}?m4h=t" ></map-link>
         </map-extent>    
-      </layer->
+      </map-layer>
     </mapml-viewer>
     <button name="change" autofocus type="button" onclick="changeProjection()">Change map projection</button>
 </body>
diff --git a/change-projection/projection-negotiation/index.html b/change-projection/projection-negotiation/index.html
index aee15a6..8940473 100644
--- a/change-projection/projection-negotiation/index.html
+++ b/change-projection/projection-negotiation/index.html
@@ -25,14 +25,14 @@
     </head>
   <body>
     <template id="negotiable-map-content">
-      <layer- src="msi-tiles-osmtile.mapml" checked></layer->
+      <map-layer src="msi-tiles-osmtile.mapml" checked></map-layer>
     </template>
     <p><a href="msi-tiles-osmtile.mapml" target="_blank">Minimum Snow and Ice Probability (view source in new tab)</a> <button onclick="addToMaps()" >Add to single source to both maps</button></p>
   <mapml-viewer projection="CBMTILE" zoom="4" lat="60" lon="-90" controls>
-    <layer- label="CBMT" src="../../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->
+    <map-layer label="CBMT" src="../../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></map-layer>
   </mapml-viewer>
   <mapml-viewer projection="OSMTILE" zoom="4" lat="60" lon="-90" controls>
-    <layer- label="CBMT" src="../../refactoring-temporary/osmtile-cbmt.mapml" checked hidden></layer->
+    <map-layer label="CBMT" src="../../refactoring-temporary/osmtile-cbmt.mapml" checked hidden></map-layer>
   </mapml-viewer>
   </body>
 </html>
diff --git a/change-projection/zoomin-zoomout/mapml-viewer/index.html b/change-projection/zoomin-zoomout/mapml-viewer/index.html
index 480508f..8448c63 100644
--- a/change-projection/zoomin-zoomout/mapml-viewer/index.html
+++ b/change-projection/zoomin-zoomout/mapml-viewer/index.html
@@ -48,7 +48,7 @@
   </head>
   <body>
     <mapml-viewer projection="CBMTILE" zoom="8" lat="48.840422" lon="-101.219978" controls>
-      <layer- label="CBMT" src="../cbmt-changeProjection.mapml" checked ></layer->
+      <map-layer label="CBMT" src="../cbmt-changeProjection.mapml" checked ></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/change-projection/zoomin-zoomout/web-map/index.html b/change-projection/zoomin-zoomout/web-map/index.html
index 9977362..34d4138 100644
--- a/change-projection/zoomin-zoomout/web-map/index.html
+++ b/change-projection/zoomin-zoomout/web-map/index.html
@@ -48,7 +48,7 @@
   </head>
   <body>
     <map is="web-map" projection="CBMTILE" zoom="8" lat="48.840422" lon="-101.219978" controls>
-      <layer- label="CBMT" src="../cbmt-changeProjection.mapml" checked></layer->
+      <map-layer label="CBMT" src="../cbmt-changeProjection.mapml" checked></map-layer>
     </map>
   </body>
 </html>
diff --git a/custom-projections/Arctic-SDI/index.html b/custom-projections/Arctic-SDI/index.html
index 251e1cc..bc64e3f 100644
--- a/custom-projections/Arctic-SDI/index.html
+++ b/custom-projections/Arctic-SDI/index.html
@@ -36,8 +36,8 @@
   </head>
   <body>
     <mapml-viewer projection="EPSG3573" zoom="2" lat="90" lon="-90" controls>
-<!--      <layer- label="Style-based approach to linking the Arctic nations SDIs" src="canada/alternates.mapml" checked></layer->-->
-      <layer- label="Explicit links to Canada's Arctic SDI Partners" src='canada/links.mapml' checked></layer->
+<!--      <map-layer label="Style-based approach to linking the Arctic nations SDIs" src="canada/alternates.mapml" checked></map-layer>-->
+      <map-layer label="Explicit links to Canada's Arctic SDI Partners" src='canada/links.mapml' checked></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/custom-projections/Atlas-of-Canada/index.html b/custom-projections/Atlas-of-Canada/index.html
index 80d2bb5..68cfd6c 100644
--- a/custom-projections/Atlas-of-Canada/index.html
+++ b/custom-projections/Atlas-of-Canada/index.html
@@ -23,7 +23,7 @@
   </head>
   <body>
     <mapml-viewer projection="ATLAS_POLAR_MAP" zoom="2" lat="83.48919" lon="-87.7687" controls>
-      <layer- label="Atlas of Canada Polar Wall Map" checked>
+      <map-layer label="Atlas of Canada Polar Wall Map" checked>
         <map-link rel="license" title="Canadian Federal Geospatial Platform" href="https://geoappext.nrcan.gc.ca/arcgis/rest/services/FGP/NCR_RCN/MapServer/"></map-link>
         <map-extent units="ATLAS_POLAR_MAP" checked hidden>
           <map-input type="zoom" name="z" min="0" max="6" value="6" ></map-input>
@@ -32,8 +32,8 @@
           <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/FGP/NCR_RCN/MapServer/tile/{z}/{y}/{x}/"></map-link>
 <!--          <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/FGP/NCR_RCN_A/MapServer/tile/{z}/{y}/{x}/"></map-link>-->
         </map-extent>
-      </layer->
-      <layer- label="Annotation" src="annotation.mapml" checked></layer->
+      </map-layer>
+      <map-layer label="Annotation" src="annotation.mapml" checked></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/custom-projections/BNG/index.html b/custom-projections/BNG/index.html
index 7d566c4..46cfb9e 100644
--- a/custom-projections/BNG/index.html
+++ b/custom-projections/BNG/index.html
@@ -63,7 +63,7 @@
          /* border: none; */ 
        } 
         
-       /* Pre-style to avoid FOUC of inline layer- and fallback content. */ 
+       /* Pre-style to avoid FOUC of inline map-layer and fallback content. */ 
        mapml-viewer:not(:defined) > * { 
          display: none; 
        } 
@@ -71,7 +71,7 @@
        supported, or if javascript is disabled. This needs to be defined separately 
        from the above, because the `:not(:defined)` selector invalidates the entire 
        declaration in browsers that do not support it. */ 
-       layer- { 
+       map-layer { 
          display: none; 
        } 
      </style> 
@@ -93,7 +93,7 @@
        <style> 
          /* Ensure fallback content (children of the map element) is displayed if 
          custom/built-in elements is supported but javascript is disabled. */ 
-         mapml-viewer:not(:defined) > :not(layer-) { 
+         mapml-viewer:not(:defined) > :not(map-layer) { 
            display: initial; 
          } 
        </style> 
@@ -102,7 +102,7 @@
   <body>
     <!-- when using  -->
     <mapml-viewer zoom="0" lat="54.41338" lon="-3.19995" controls projection="BNG">
-      <layer- label="OS Roads tile map in BNG custom projection" checked>
+      <map-layer label="OS Roads tile map in BNG custom projection" checked>
         <map-meta name="projection" content="BNG"></map-meta>
         <map-extent units="BNG" checked hidden>
           <map-input  name="z" type="zoom" min="0" max="9"></map-input>
@@ -110,9 +110,9 @@
           <map-input  name="x" type="location" units="tilematrix" axis="column"></map-input>
           <map-link rel="tile"   tref="https://api.os.uk/maps/raster/v1/wmts?key=TtPU7xWvj7AmV6uePZRYWFXuKVHzRTq7&tileMatrixSet=EPSG:27700&version=1.0.0&style=default&layer=Road_27700&service=WMTS&request=GetTile&tileCol={x}&tileRow={y}&tileMatrix={z}"></map-link>
         </map-extent>        
-      </layer->
-      <layer- checked src="bgs-surficial-geology.mapml"></layer->
-      <layer- label="BNG Shrink/Swell WMS" >
+      </map-layer>
+      <map-layer checked src="bgs-surficial-geology.mapml"></map-layer>
+      <map-layer label="BNG Shrink/Swell WMS" >
         <map-meta name="projection" content="BNG"></map-meta>
         <map-extent units="BNG" checked hidden>
             <map-input  name="xmin" type="location" rel="map" position="top-left" axis="easting" units="pcrs" min="240755" max="261199" ></map-input>
@@ -123,7 +123,7 @@
             <map-input  name="h" type="height" min="1" max="10000" ></map-input>
             <map-link rel="image" tref="https://ogc.bgs.ac.uk/cgi-bin/BGS_1GE_Geology/wms?version=1.3.0&request=GetMap&layers=GBR_Kilmarnock_BGS_50k_ShrinkSwell&styles=&format=image/png&crs=epsg:27700&BBOX={xmin},{ymin},{xmax},{ymax}&WIDTH={w}&HEIGHT={h}"></map-link>
         </map-extent>      
-      </layer->
+      </map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/custom-projections/bc/index.html b/custom-projections/bc/index.html
index 5c833b2..bb71818 100644
--- a/custom-projections/bc/index.html
+++ b/custom-projections/bc/index.html
@@ -23,7 +23,7 @@
   </head>
   <body>
     <mapml-viewer zoom="3" lon="-125.667383" lat="54.60128" controls projection="BCTILE">
-      <layer- label="BC basemap" checked>
+      <map-layer label="BC basemap" checked>
         <map-link rel="license" title="Government of British Columbia" href="https://maps.gov.bc.ca/arcserver/rest/services/province/albers_cache/MapServer/wmts/"></map-link>
         <map-extent units="BCTILE" checked hidden>
           <map-input  type="zoom" name="z" min="0" max="11" value="3"></map-input>
@@ -31,8 +31,8 @@
           <map-input  type="location" name="y" axis="row" units="tilematrix" min="56" max="64"></map-input>
           <map-link rel="tile" tref="https://maps.gov.bc.ca/arcgis/rest/services/province/albers_cache/MapServer/WMTS/tile/1.0.0/province_albers_cache/default/default028mm/{z}/{y}/{x}.jpg"></map-link>
         </map-extent>
-      </layer->
-      <layer- label="British Columbia Geological Survey" src="bcgs.mapml" checked></layer->
+      </map-layer>
+      <map-layer label="British Columbia Geological Survey" src="bcgs.mapml" checked></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/datacube/index.html b/datacube/index.html
index 86d633c..bde5861 100644
--- a/datacube/index.html
+++ b/datacube/index.html
@@ -9,9 +9,9 @@
     </head>
   <body>
   <mapml-viewer projection="CBMTILE" zoom="4" lat="60" lon="-90" controls>
-    <layer- label="CBMT" src="../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->
-    <layer- label="Minimum Snow and Ice" src="msi.mapml" checked></layer->
-    <layer- label="Permanent snow and ice (prob. 94% or more) WMS GetMap" src="msi-94-plus.mapml" checked></layer->
+    <map-layer label="CBMT" src="../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></map-layer>
+    <map-layer label="Minimum Snow and Ice" src="msi.mapml" checked></map-layer>
+    <map-layer label="Permanent snow and ice (prob. 94% or more) WMS GetMap" src="msi-94-plus.mapml" checked></map-layer>
   </mapml-viewer>
   </body>
 </html>
diff --git a/global.css b/global.css
index b0a229d..2c94c25 100644
--- a/global.css
+++ b/global.css
@@ -30,7 +30,7 @@ mapml-viewer:defined,
   vertical-align: middle;
 }
 
-/* Pre-style to avoid FOUC of inline layer- and fallback content. */
+/* Pre-style to avoid FOUC of inline map-layer and fallback content. */
 mapml-viewer:not(:defined) > * {
   display: none;
 }
@@ -42,6 +42,6 @@ mapml-viewer:not(:defined) > * {
 supported, or if javascript is disabled. This needs to be defined separately
 from the above, because the `:not(:defined)` selector invalidates the entire
 declaration in browsers that do not support it. */
-layer- {
+map-layer {
  display: none;
 }
diff --git a/human-geo-web/index.html b/human-geo-web/index.html
index 56278ef..4caa4f0 100644
--- a/human-geo-web/index.html
+++ b/human-geo-web/index.html
@@ -32,7 +32,7 @@
     </p>
     <mapml-viewer  projection="CBMTILE" zoom="3" lat="64.8" lon="-83.4" controls>
       <map-caption>The provinces and territories of Canada, 1867</map-caption>
-      <layer- label="Territorial Evolution 1867" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1867/" checked></layer->
+      <map-layer label="Territorial Evolution 1867" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1867/" checked></map-layer>
     </mapml-viewer>
     
     <p>In 1880, an Imperial Order in Council transfers to Canada all of the British
@@ -41,13 +41,13 @@
     </p>
     <mapml-viewer  projection="CBMTILE" zoom="3" lat="64.8" lon="-83.4" controls>
       <map-caption>The provinces and territories of Canada, 1880</map-caption>
-      <layer- label="Territorial Evolution 1880" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1880/" checked></layer->
+      <map-layer label="Territorial Evolution 1880" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1880/" checked></map-layer>
     </mapml-viewer>
     
     <p>In 1901, the boundaries of the Yukon Territory are changed to those of today.</p>
     <mapml-viewer  projection="CBMTILE" zoom="3" lat="64.8" lon="-83.4" controls>
       <map-caption>The provinces and territories of Canada, 1901</map-caption>
-      <layer- label="Territorial Evolution 1901" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1901/" checked></layer->
+      <map-layer label="Territorial Evolution 1901" src="https://geogratis.gc.ca/mapml/en/cbmtile/te1901/" checked></map-layer>
     </mapml-viewer>
     
     <p>
@@ -55,7 +55,7 @@
     </p>
     <mapml-viewer  projection="CBMTILE" zoom="3" lat="64.8" lon="-83.4" controls>
       <map-caption>The provinces and territories of Canada, 2003</map-caption>
-      <layer- label="Territorial Evolution 2003" src="https://geogratis.gc.ca/mapml/en/cbmtile/te2003/" checked></layer->
+      <map-layer label="Territorial Evolution 2003" src="https://geogratis.gc.ca/mapml/en/cbmtile/te2003/" checked></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/i18n/map-chrome-i18n/index.html b/i18n/map-chrome-i18n/index.html
index 3829128..32078b0 100644
--- a/i18n/map-chrome-i18n/index.html
+++ b/i18n/map-chrome-i18n/index.html
@@ -16,7 +16,7 @@
   </head>
   <body>
   <mapml-viewer zoom="6" lon="31.135254" lat="49.066668" controls projection="OSMTILE">
-    <layer- label="United Nations Web Map Tile Service"  checked >
+    <map-layer label="United Nations Web Map Tile Service"  checked >
       <map-link rel="license" href="https://www.un.org/geospatial/mapsgeo/webservices" title="Підготовлено Геопросторовою службою Організації Об'єднаних Націй"></map-link>
       <map-extent units="OSMTILE" checked hidden>
         <map-input name="TileMatrix" type="zoom" value="18" min="0" max="6"></map-input>
@@ -24,7 +24,7 @@
         <map-input name="TileRow" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
         <map-link rel="tile" tref="https://geoservices.un.org/arcgis/rest/services/ClearMap_WebTopo/MapServer/tile/{TileMatrix}/{TileRow}/{TileCol}"></map-link>
       </map-extent>
-    </layer->
+    </map-layer>
 </mapml-viewer>
 </body>
 </html>
diff --git a/i18n/rtl/index.html b/i18n/rtl/index.html
index b443c13..6647fd8 100644
--- a/i18n/rtl/index.html
+++ b/i18n/rtl/index.html
@@ -9,8 +9,8 @@
   </head>
   <body>
     <mapml-viewer dir="rtl" projection="OSMTILE" zoom="15" lat="45.4069740362364" lon="-75.70155300710053" controls>
-      <layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/osmtile/cbmt/" checked></layer->
-      <layer- id="restaurant" label="Ottawa Restaurants" checked>
+      <map-layer label="CBMT" src="https://geogratis.gc.ca/mapml/en/osmtile/cbmt/" checked></map-layer>
+      <map-layer id="restaurant" label="Ottawa Restaurants" checked>
         <map-meta name="cs" content="gcrs" ></map-meta>
         <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta>
         <map-extent units="OSMTILE" checked hidden>
@@ -25,7 +25,7 @@
             </map-select>
             <map-link tref="../../shared/restaurants/{cusine}.mapml" rel="features"></map-link>
           </map-extent>
-      </layer->
+      </map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/inline-content/index.html b/inline-content/index.html
index e2c635c..8d47e29 100644
--- a/inline-content/index.html
+++ b/inline-content/index.html
@@ -14,7 +14,7 @@
   </head>
   <body>
     <div>
-      <p>This document illustrates including MapML features directly into the HTML document as child content of the &lt;layer-&gt; element.
+      <p>This document illustrates including MapML features directly into the HTML document as child content of the &lt;map-layer&gt; element.
         The use case is to make it 'easy' for HTML authors to include content such as placemarks on a map.  They might not 'own' a map service
         but they would be able to provide location for stuff like images, buildings, areas, linear features etc., *and* be able to 
         style those representations with CSS.</p>
@@ -37,30 +37,30 @@
       
       <pre style="overflow-x: auto;">
     &lt;map is="web-map" zoom="16" lat="45.399627" lon="-75.706143" width="400" height="300" controls projection="CBMTILE"&gt;
-      &lt;layer- label="cbmt_en" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden&gt;&lt;/layer-&gt;
-      &lt;layer- label="Point"&gt;
+      &lt;map-layer label="cbmt_en" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden&gt;&lt;/map-layer&gt;
+      &lt;map-layer label="Point"&gt;
        &lt;!-- in HTML the meta element is void (no closing tag), and since this is 
              being parsed by the HTML parser, we should be able to get away with 
              that when including features in "HTML" content --&gt;
         &lt;map-meta name="zoom" content="min=14,max=18"&gt;
         &lt;map-meta name="extent" content="xmin=-76,ymin=45,xmax=-73,ymax=46"&gt;
         &lt;map-feature&gt;&lt;map-properties&gt;&lt;name&gt;Canada Centre for Mapping and Earth Observation&lt;/name&gt;&lt;/map-properties&gt;&lt;map-geometry&gt;&lt;Point&gt;&lt;map-coordinates&gt;-75.705961 45.398511&lt;/map-coordinates&gt;&lt;/Point&gt;&lt;/map-geometry&gt;&lt;/map-feature&gt;
-      &lt;/layer-&gt;
+      &lt;/map-layer&gt;
       &lt;-- ommitting line and polygon markup for brevity. Note that you get a nasty FOUC (Flash Of Unstyled Content) in IE --&gt;
       &lt;-- very easy to get carried away with all this GIS-y stuff, so awaiting your comments :-) --&gt;
     &lt;/map&gt;
       </pre>
     </div>
     <mapml-viewer zoom="16" lon="-75.704540" lat="45.399918" controls projection="CBMTILE">
-      <layer- label="Canada Base Map - Transportation" checked hidden>
+      <map-layer label="Canada Base Map - Transportation" checked hidden>
         <map-extent units="CBMTILE" checked hidden>
           <map-input  name="z" type="zoom" value="17" min="0" max="17"></map-input>
           <map-input  name="y" type="location" units="tilematrix" axis="row" min="29750" max="34475"></map-input>
           <map-input  name="x" type="location" units="tilematrix" axis="column" min="26484" max="32463"></map-input>
           <map-link rel="tile" tref="https://geoappext.nrcan.gc.ca/arcgis/rest/services/BaseMaps/CBMT3978/MapServer/tile/{z}/{y}/{x}?m4h=t"></map-link>
         </map-extent>
-      </layer->
-      <layer- label="Booth Street" checked>
+      </map-layer>
+      <map-layer label="Booth Street" checked>
         <map-title>Booth Street</map-title>
         <style>
           .street {
@@ -86,8 +86,8 @@
             </table>
           </map-properties>
           <map-geometry><map-linestring class="street"><map-coordinates>-75.7043047 45.3991258 -75.7054911 45.4010507 -75.7098477 45.4083249 -75.7150564 45.4170017 -75.7156161 45.4179239 -75.7162458 45.4185545 -75.7162458 45.4185545</map-coordinates></map-linestring></map-geometry></map-feature>
-      </layer->
-      <layer- label="Canada Centre for Mapping and Earth Observation" checked>
+      </map-layer>
+      <map-layer label="Canada Centre for Mapping and Earth Observation" checked>
         <style>
           .building {
             stroke-width: 1px;
@@ -104,8 +104,8 @@
           <map-properties><a href="https://www.nrcan.gc.ca/science-and-data/science-and-research/earth-sciences/geomatics/canadas-spatial-data-infrastructure/10783">Canada Centre for Mapping and Earth Observation</a></map-properties>
           <map-geometry><map-point class="building"><map-coordinates>-75.705961 45.398511</map-coordinates></map-point></map-geometry>
         </map-feature>
-      </layer->
-      <layer- label="Dows Lake" checked>
+      </map-layer>
+      <map-layer label="Dows Lake" checked>
         <style>
           .map-a {
             fill-opacity: 0.7; 
@@ -139,7 +139,7 @@
           
           <map-geometry><map-a  href="https://dowslake.com/" type="text/html"><map-polygon><map-coordinates>-75.7004373 45.3910771 -75.7009141 45.391092 -75.7013957 45.3911071 -75.7013962 45.3911431 -75.7013484 45.3914135 -75.7013647 45.3916924 -75.7017012 45.3920504 -75.7021009 45.3923449 -75.7022552 45.3924249 -75.7026795 45.3926473 -75.7030646 45.392798 -75.7031677 45.3928693 -75.7035397 45.392993 -75.7036428 45.3930644 -75.7038225 45.3931352 -75.7038613 45.393171 -75.7038889 45.3933329 -75.7039081 45.393366 -75.7039411 45.3934225 -75.7038435 45.3937922 -75.7037934 45.3938735 -75.7037427 45.3939099 -75.703679 45.3939193 -75.7036022 45.3939107 -75.703307 45.3937956 -75.7027689 45.3936729 -75.7025642 45.3936472 -75.7025003 45.3936476 -75.7024494 45.3936659 -75.7024116 45.3937112 -75.7024255 45.3938011 -75.7024645 45.3938549 -75.7027218 45.3939973 -75.7028124 45.3940957 -75.7031088 45.3943009 -75.7034942 45.3944695 -75.7036618 45.3945945 -75.7036876 45.3946123 -75.7038943 45.3948001 -75.7039713 45.3948266 -75.7041248 45.3948436 -75.7043172 45.3949054 -75.704381 45.394896 -75.7044317 45.3948687 -75.7044957 45.3948773 -75.7045728 45.3949128 -75.7047796 45.3951006 -75.704921 45.3951717 -75.7050113 45.3952431 -75.7050374 45.395288 -75.7052303 45.3953858 -75.7053726 45.3955289 -75.7054627 45.3955824 -75.7056823 45.395779 -75.7056961 45.39586 -75.7058502 45.395922 -75.7058763 45.3959668 -75.7059536 45.3960204 -75.7059674 45.3961013 -75.7058916 45.3961738 -75.7058022 45.3961743 -75.7055454 45.3960679 -75.7054306 45.3960867 -75.7052292 45.396331 -75.7052564 45.3964568 -75.7055005 45.3965723 -75.7055268 45.3966262 -75.7056423 45.3966704 -75.7057188 45.396661 -75.7057818 45.3965885 -75.7057684 45.3965346 -75.7059826 45.3962992 -75.7059692 45.3962453 -75.7060321 45.3961729 -75.7061469 45.3961542 -75.7063395 45.396234 -75.70638 45.3964048 -75.7054853 45.3974006 -75.7053331 45.3974915 -75.7051679 45.3975646 -75.7049769 45.3976108 -75.7047726 45.3976211 -75.704765 45.3976206 -75.7046447 45.3976129 -75.7046317 45.3975949 -75.7045421 45.3975775 -75.7044273 45.3975962 -75.7044018 45.3975964 -75.7043374 45.3975608 -75.7042854 45.3974891 -75.7038487 45.3973028 -75.7036813 45.3971958 -75.7033225 45.397108 -75.7029632 45.3969843 -75.7023094 45.3967993 -75.7017835 45.3966316 -75.701693 45.3965511 -75.7014103 45.3964179 -75.7010758 45.3962309 -75.7006887 45.3959183 -75.7005848 45.3957839 -75.7004557 45.3956677 -75.7002626 45.3955519 -75.6998627 45.3952393 -75.6995528 45.3949712 -75.6993328 45.3947475 -75.6992298 45.3946851 -75.6990886 45.394632 -75.6988679 45.3944852 -75.6987666 45.3944179 -75.6984065 45.3942221 -75.697983 45.3940717 -75.6975088 45.3939486 -75.6973425 45.3939316 -75.6971763 45.3939236 -75.6970359 45.3939334 -75.6969467 45.393952 -75.6969125 45.3938768 -75.6968285 45.3936917 -75.6969299 45.393628 -75.697209 45.3934643 -75.6973865 45.3933552 -75.6983865 45.392602 -75.6996907 45.3916579 -75.7004377 45.3911131 -75.7004373 45.3910771</map-coordinates><map-coordinates>-75.7043714 45.3951571 -75.7043974 45.395193 -75.7044615 45.3952106 -75.7045003 45.3952463 -75.7045389 45.3952641 -75.7046027 45.3952637 -75.7046677 45.3953533 -75.7047317 45.3953619 -75.7047955 45.3953525 -75.7048077 45.3953075 -75.7047303 45.3952449 -75.7046662 45.3952273 -75.7045632 45.3951649 -75.7043714 45.3951571</map-coordinates></map-polygon></map-a></map-geometry>
         </map-feature>
-      </layer->
+      </map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/linking/features/index.html b/linking/features/index.html
index b49085f..783cb14 100644
--- a/linking/features/index.html
+++ b/linking/features/index.html
@@ -32,7 +32,7 @@
          /* border: none; */ 
        } 
         
-       /* Pre-style to avoid FOUC of inline layer- and fallback content. */ 
+       /* Pre-style to avoid FOUC of inline map-layer and fallback content. */ 
        mapml-viewer:not(:defined) > * { 
          display: none; 
        } 
@@ -40,7 +40,7 @@
        supported, or if javascript is disabled. This needs to be defined separately 
        from the above, because the `:not(:defined)` selector invalidates the entire 
        declaration in browsers that do not support it. */ 
-       layer- { 
+       map-layer { 
          display: none; 
        } 
      </style> 
@@ -48,7 +48,7 @@
        <style> 
          /* Ensure fallback content (children of the map element) is displayed if 
          custom/built-in elements is supported but javascript is disabled. */ 
-         mapml-viewer:not(:defined) > :not(layer-) { 
+         mapml-viewer:not(:defined) > :not(map-layer) { 
            display: initial; 
          } 
        </style> 
@@ -94,7 +94,7 @@
   </head>
   <body>
     <mapml-viewer projection="CBMTILE" zoom="3" lat="58.063535" lon="-88.500485" controls>
-      <layer- label="Canada" src="canada.mapml" checked=""></layer->
+      <map-layer label="Canada" src="canada.mapml" checked=""></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/linking/zoomin-zoomout/mapml-viewer/index.html b/linking/zoomin-zoomout/mapml-viewer/index.html
index ba02c5e..728c81c 100644
--- a/linking/zoomin-zoomout/mapml-viewer/index.html
+++ b/linking/zoomin-zoomout/mapml-viewer/index.html
@@ -9,7 +9,7 @@
   </head>
   <body>
     <mapml-viewer projection="OSMTILE" zoom="7" lat="51.8" lon="-97.8" controls>
-      <layer- label="CBMT" src="../cbmt-osmtile.mapml" checked ></layer->
+      <map-layer label="CBMT" src="../cbmt-osmtile.mapml" checked ></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/map-feature/index.html b/map-feature/index.html
index 7137ab5..f3f29bc 100644
--- a/map-feature/index.html
+++ b/map-feature/index.html
@@ -32,7 +32,7 @@
          /* border: none; */ 
        } 
         
-       /* Pre-style to avoid FOUC of inline layer- and fallback content. */ 
+       /* Pre-style to avoid FOUC of inline map-layer and fallback content. */ 
        mapml-viewer:not(:defined) > * { 
          display: none; 
        } 
@@ -40,7 +40,7 @@
        supported, or if javascript is disabled. This needs to be defined separately 
        from the above, because the `:not(:defined)` selector invalidates the entire 
        declaration in browsers that do not support it. */ 
-       layer- { 
+       map-layer { 
          display: none; 
        } 
      </style> 
@@ -48,7 +48,7 @@
        <style> 
          /* Ensure fallback content (children of the map element) is displayed if 
          custom/built-in elements is supported but javascript is disabled. */ 
-         mapml-viewer:not(:defined) > :not(layer-) { 
+         mapml-viewer:not(:defined) > :not(map-layer) { 
            display: initial; 
          } 
        </style> 
@@ -56,7 +56,7 @@
   </head>
   <body>
     <mapml-viewer projection="CBMTILE" zoom="3" lat="58.063535" lon="-88.500485" controls>
-      <layer- label="Canada" checked>
+      <map-layer label="Canada" checked>
         <map-meta name="projection" content="CBMTILE"></map-meta>
         <map-meta name="cs" content="gcrs" ></map-meta>
         <map-meta name="extent" content="top-left-easting=-3263369,top-left-northing=4046262,bottom-right-easting=3823752,bottom-right-northing=-1554448" ></map-meta>
@@ -2138,7 +2138,7 @@
           </map-point>
         </map-geometry>
       </map-feature>
-      </layer->
+      </map-layer>
     </mapml-viewer>
   <script>
 //    document.querySelector('map-feature').focus();
diff --git a/multiple-extents/index.html b/multiple-extents/index.html
index 82816d4..79ca729 100644
--- a/multiple-extents/index.html
+++ b/multiple-extents/index.html
@@ -11,7 +11,7 @@
     <!-- spearfish zoom="12" lon="-103.72558592353018" lat="44.42865428227619" -->
     <!-- restaurants zoom="15" lon="-75.703611" lat="45.411105" -->
   <mapml-viewer zoom="15" lon="-75.703611" lat="45.411105" controls projection="OSMTILE">
-    <layer- label="National Geographic"  checked>
+    <map-layer label="National Geographic"  checked>
       <map-extent label="National Geographic" units="OSMTILE" checked>
         <map-input name="TileMatrix" type="zoom" value="18" min="0" max="18"></map-input>
         <map-input name="TileCol" type="location" units="tilematrix" axis="column" min="0" max="262144"></map-input>
@@ -31,8 +31,8 @@
         <map-input name="TileRow" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
         <map-link rel="tile" tref="https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/tile/1.0.0/World_Imagery/default/default028mm/{TileMatrix}/{TileRow}/{TileCol}.jpg"></map-link>
       </map-extent>
-    </layer->
-    <layer- label="Restaurants">
+    </map-layer>
+    <map-layer label="Restaurants">
      <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta>
       <map-extent units="OSMTILE" checked>
         <map-select id="restaurants" name="cusine">
@@ -46,9 +46,9 @@
         </map-select>
         <map-link tref="../shared/restaurants/{cusine}.mapml" rel="features"></map-link>
       </map-extent>
-    </layer->
+    </map-layer>
 
-<!--    <layer- label="Spearfish - inline" checked>
+<!--    <map-layer label="Spearfish - inline" checked>
       <map-meta name="extent" content="top-left-easting=-11573304.98,top-left-northing=5545277.52,bottom-right-easting=-11526672.02,bottom-right-northing=5520645.67"></map-meta>
       <map-meta name="zoom" content="min=6,max=24"></map-meta>
       <map-extent label="Elevation (m)" units="OSMTILE" checked>
@@ -120,8 +120,8 @@
         <map-input name="h" type="height" min="1" max="10000"></map-input>
         <map-link tref="https://localhost:8081/geoserver/wms?request=GetMap&crs=urn:x-ogc:def:crs:EPSG:3857&service=WMS&bbox={xmin},{ymin},{xmax},{ymax}&layers=bugsites&format=image/png&width={w}&styles=&version=1.3.0&transparent=true&height={h}" rel="image"></map-link>
       </map-extent>
-    </layer->-->
-<!--    <layer- label="Spearfish fetch" src="spearfish.mapml" ></layer->-->
+    </map-layer>-->
+<!--    <map-layer label="Spearfish fetch" src="spearfish.mapml" ></map-layer>-->
 
 </mapml-viewer>
 </body>
diff --git a/painting/index.html b/painting/index.html
index 5c6d9c9..3fb314d 100644
--- a/painting/index.html
+++ b/painting/index.html
@@ -31,7 +31,7 @@
         <li>Support for the <a href="https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification">tms</a> link attribute: &lt;link rel="tile" tms tref="..."&gt;</li>
       </ul>
       <mapml-viewer projection="WGS84" zoom="2" lon="-111.062839" lat="-8.059046" controls controlslist="noscale">
-        <layer- label="Painting" checked>
+        <map-layer label="Painting" checked>
           <map-meta name="zoom" content="min=0,max=7"></map-meta>
           <map-extent units="WGS84" checked hidden>
               <map-input  name="zoomLevel" type="zoom" value="1" min="0" max="4"></map-input>
@@ -39,8 +39,8 @@
               <map-input  name="col" type="location" axis="column" units="tilematrix" min="0" max="2"></map-input>
               <map-link tms rel="tile" tref="https://maps4html.org/TiledArt-Rousseau/TheBanksOfTheBièvreNearBicêtre/{zoomLevel}/{col}/{row}.png"></map-link>
           </map-extent>
-          </layer->
-          <layer- label="People" checked>
+          </map-layer>
+          <map-layer label="People" checked>
             <map-meta name="projection" content="WGS84"></map-meta>
             <map-feature id="girl2" class="child" zoom="2" min="2" max="4">
               <map-featurecaption>Girl - zoom=2</map-featurecaption>
@@ -86,7 +86,7 @@
               </map-geometry>
               <map-properties></map-properties>
             </map-feature>
-        </layer->
+        </map-layer>
       </mapml-viewer>
     </body>
 </html>
diff --git a/progressive-enhancement/index.html b/progressive-enhancement/index.html
index 91d9742..027347d 100644
--- a/progressive-enhancement/index.html
+++ b/progressive-enhancement/index.html
@@ -17,7 +17,7 @@
         contain-intrinsic-size: 304px 154px;
       }
       
-      /* Pre-style to avoid FOUC of inline layer- and fallback content. */
+      /* Pre-style to avoid FOUC of inline map-layer and fallback content. */
       [is="web-map"]:not(:defined) + img[usemap],
       [is="web-map"]:not(:defined) > :not(area):not(.mapml-web-map) {
         display: none;
@@ -31,7 +31,7 @@
       or if javascript is disabled. This needs to be defined separately
       from the above, because the `:not(:defined)` selector invalidates the entire
       declaration in browsers that do not support it. */
-      layer- {
+      map-layer {
        display: none;
       }
     </style>
@@ -70,11 +70,11 @@
   <body>
     
     <map name="dowslake" is="web-map" zoom="17" lat="45.398043" lon="-75.70683" controls>
-      <layer- id="osm" src="../refactoring-temporary/osm.mapml" label="Open Street Map" checked></layer->
+      <map-layer id="osm" src="../refactoring-temporary/osm.mapml" label="Open Street Map" checked></map-layer>
       <!-- the HTML author can create MapML files and serve them as layers if they prefer -->
-      <layer- id="marker" label="Marker layer" src="marker.mapml"></layer->
+      <map-layer id="marker" label="Marker layer" src="marker.mapml"></map-layer>
       <!-- Inline layer content: how does this behave w/o scripting? -->
-      <layer- label="Inline MapML" checked>
+      <map-layer label="Inline MapML" checked>
         <map-feature zoom="17">
           <map-meta name="projection" content="OSMTILE"></map-meta>
         <map-featurecaption>Where The Wild Things Are</map-featurecaption>
@@ -87,7 +87,7 @@ <h2>Where The Wild Things Are, by Maurice Sendak</h2>
             <map-coordinates>-8427535 5684693</map-coordinates>
           </map-point>
         </map-geometry>
-      </map-feature></layer->
+      </map-feature></map-layer>
       
       <!-- you could do this more precisely with shape="poly" and appropriate coords, but I was too lazy -->
       <area is="map-area" href="https://example.com/marker/" alt="Marker" coords="255,145,275,190" shape="rect" style="fill: none;stroke: blue;stroke-width: 3px">
diff --git a/screenreader/announce-zoom/index.html b/screenreader/announce-zoom/index.html
index 474c1d4..7dc2271 100644
--- a/screenreader/announce-zoom/index.html
+++ b/screenreader/announce-zoom/index.html
@@ -15,7 +15,7 @@
 <body>
   <mapml-viewer projection="OSMTILE" zoom="11" lat="48.8566" lon="2.3522" frameborder="0" controls controlslist="nofullscreen nolayer noreload">
       <map-caption>Paris, the City of Light</map-caption>
-      <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
+      <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></map-layer>
   </mapml-viewer>
 </body>
 </html>
diff --git a/screenreader/closest-restaurants/index.html b/screenreader/closest-restaurants/index.html
index 3231b2c..2f67dec 100644
--- a/screenreader/closest-restaurants/index.html
+++ b/screenreader/closest-restaurants/index.html
@@ -14,7 +14,7 @@
 </head>
 <body>
   <template>
-    <layer- id="restaurant" label="Restaurants" checked>
+    <map-layer id="restaurant" label="Restaurants" checked>
       <map-meta name="cs" content="gcrs" ></map-meta>
       <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta>
       <map-extent units="OSMTILE" checked hidden>
@@ -29,7 +29,7 @@
           </map-select>
           <map-link tref="../../shared/restaurants/{cusine}.mapml" rel="features"></map-link>
         </map-extent>
-    </layer->
+    </map-layer>
   </template>
     
     <div class="search" role="search">
@@ -51,7 +51,7 @@
     </div>
 
     <mapml-viewer projection="OSMTILE" zoom="4" lat="58.276703" lon="-103.710938" controls controlslist="nofullscreen" id="map">
-        <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></layer->
+        <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked></map-layer>
     </mapml-viewer>
     
     <script>
diff --git a/screenreader/feature-index/index.html b/screenreader/feature-index/index.html
index cd75fb2..a475e31 100644
--- a/screenreader/feature-index/index.html
+++ b/screenreader/feature-index/index.html
@@ -14,8 +14,8 @@
 </head>
 <body>
 <mapml-viewer projection="OSMTILE" zoom="14" lat="45.406314" lon="-75.6883335" controls>
-  <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked hidden></layer->
-  <layer- label="Ottawa Restaurants" src="../../shared/restaurants/restaurants.mapml" checked></layer->
+  <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked hidden></map-layer>
+  <map-layer label="Ottawa Restaurants" src="../../shared/restaurants/restaurants.mapml" checked></map-layer>
 </mapml-viewer>
 
 
diff --git a/screenreader/restaurants/index.html b/screenreader/restaurants/index.html
index 8895ee5..6d7e1fa 100644
--- a/screenreader/restaurants/index.html
+++ b/screenreader/restaurants/index.html
@@ -9,10 +9,10 @@
   </head>
   <body>
 <!--    <mapml-viewer projection="CBMTILE" zoom="17" lat="45.4069740362364" lon="-75.70155300710053" >
-      <layer- label="CBMT" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->-->
+      <map-layer label="CBMT" src="/experiments/refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></map-layer>-->
     <mapml-viewer projection="OSMTILE" zoom="14" lat="45.406314" lon="-75.6883335" controls controlslist="geolocation">
-      <layer- label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked hidden></layer->
-      <layer- id="restaurant" label="Restaurants" checked>
+      <map-layer label="OpenStreetMap" src="../../refactoring-temporary/osm.mapml" checked hidden></map-layer>
+      <map-layer id="restaurant" label="Restaurants" checked>
         <map-meta name="cs" content="gcrs" ></map-meta>
         <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta>
         <map-extent units="OSMTILE" checked hidden>
@@ -27,7 +27,7 @@
             </map-select>
             <map-link tref="../../shared/restaurants/{cusine}.mapml" rel="features"></map-link>
           </map-extent>
-      </layer->
+      </map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/security/csp/index.html b/security/csp/index.html
index 2ad2a0f..58a3d49 100644
--- a/security/csp/index.html
+++ b/security/csp/index.html
@@ -53,7 +53,7 @@
     </pre>
     
     <mapml-viewer projection="CBMTILE" zoom="5" lat="58" lon="-90" controls>
-      <layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
+      <map-layer label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></map-layer>
     </mapml-viewer>
     
     <p>
diff --git a/styling/alternate-styles/index.html b/styling/alternate-styles/index.html
index fd88129..f3e90bb 100644
--- a/styling/alternate-styles/index.html
+++ b/styling/alternate-styles/index.html
@@ -9,7 +9,7 @@
   </head>
   <body>
     <mapml-viewer zoom="3" lon="0" lat="0" controls projection="OSMTILE">
-      <layer-  src="natgeo.mapml" checked></layer->
+      <map-layer  src="natgeo.mapml" checked></map-layer>
     </mapml-viewer>
   </body>
 </html>
diff --git a/styling/dark-mode.html b/styling/dark-mode.html
index e56926f..8e4127b 100644
--- a/styling/dark-mode.html
+++ b/styling/dark-mode.html
@@ -46,7 +46,7 @@
     </p>
     
     <mapml-viewer projection="OSMTILE" zoom="1" lat="50" lon="-100" controls>
-      <layer- label="CBMT" src="../refactoring-temporary/osm.mapml" checked></layer->
+      <map-layer label="CBMT" src="../refactoring-temporary/osm.mapml" checked></map-layer>
     </mapml-viewer>
     
     <p><b>References</b></p>
diff --git a/styling/media-queries/index.html b/styling/media-queries/index.html
index d8d58c0..ebbed36 100644
--- a/styling/media-queries/index.html
+++ b/styling/media-queries/index.html
@@ -9,9 +9,9 @@
     </head>
   <body>
   <mapml-viewer projection="CBMTILE" zoom="4" lat="60" lon="-90" controls>
-    <layer- label="CBMT" src="../../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></layer->
-    <layer- label="Minimum Snow and Ice" src="msi.mapml" checked></layer->
-    <layer- label="Permanent snow and ice (prob. 94% or more) WMS GetMap" src="msi-94-plus.mapml" checked></layer->
+    <map-layer label="CBMT" src="../../refactoring-temporary/cbmtile-cbmt.mapml" checked hidden></map-layer>
+    <map-layer label="Minimum Snow and Ice" src="msi.mapml" checked></map-layer>
+    <map-layer label="Permanent snow and ice (prob. 94% or more) WMS GetMap" src="msi-94-plus.mapml" checked></map-layer>
   </mapml-viewer>
   </body>
 </html>
diff --git a/vector-tiles/mapml/mapml-viewer/index.html b/vector-tiles/mapml/mapml-viewer/index.html
index b6bcb97..c43cc25 100644
--- a/vector-tiles/mapml/mapml-viewer/index.html
+++ b/vector-tiles/mapml/mapml-viewer/index.html
@@ -20,7 +20,7 @@
   </head>
     <body>
       <mapml-viewer projection="WGS84" zoom="0" lat="0" lon="0" controls>
-        <layer- label="Countries - WorldCRS84Quad" checked>
+        <map-layer label="Countries - WorldCRS84Quad" checked>
           <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
         <map-extent units="WGS84" checked hidden>
           <!-- <map-input name="zoomLevel" type="zoom" min="0" max="6" value="0"></map-input> -->
@@ -30,11 +30,11 @@
             <map-link rel='tile' type='text/mapml' title='Tiles for ne_10m_admin_0_countries (as MapML)' tref='../tiles/wgs84/{zoomLevel}/r{row}_c{col}.mapml'></map-link> 
 <!--            <map-link rel='tile' type='text/mapml' title='Tiles for ne_10m_admin_0_countries (as MapML)' tref='https://maps.ecere.com/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WorldCRS84Quad/{zoomLevel}/{row}/{col}.mapml'></map-link>-->
         </map-extent>
-        </layer->
+        </map-layer>
       </mapml-viewer>
       <mapml-viewer projection="OSMTILE" zoom="0" lat="0" lon="0" controls>
-        <layer- label="OpenStreetMap" src="../../../refactoring-temporary/osm.mapml" checked></layer->
-        <layer- label="Countries - WebMercatorQuad" checked>
+        <map-layer label="OpenStreetMap" src="../../../refactoring-temporary/osm.mapml" checked></map-layer>
+        <map-layer label="Countries - WebMercatorQuad" checked>
           <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="OSMTILE" checked hidden>
             <!--  <map-input  name="zoomLevel" type="zoom" min="0" max="7" value="0"></map-input> -->
@@ -44,7 +44,7 @@
             <map-link rel='tile' type='text/mapml' tref='../tiles/osmtile/{zoomLevel}/{row}/{col}.mapml' ></map-link> 
 <!--            <map-link rel='tile' type='text/mapml' tref='https://maps.ecere.com/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{zoomLevel}/{row}/{col}.mapml' ></map-link>-->
           </map-extent>
-        </layer->
+        </map-layer>
       </mapml-viewer>
     </body>
 </html>
\ No newline at end of file
diff --git a/vector-tiles/mapml/web-map/index.html b/vector-tiles/mapml/web-map/index.html
index b1269c6..5fe6b09 100644
--- a/vector-tiles/mapml/web-map/index.html
+++ b/vector-tiles/mapml/web-map/index.html
@@ -20,7 +20,7 @@
     </head>
     <body>
       <map is="web-map" projection="WGS84" zoom="0" lat="0" lon="0" controls>
-        <layer- label="Countries - WorldCRS84Quad" checked>
+        <map-layer label="Countries - WorldCRS84Quad" checked>
           <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="WGS84" checked hidden>
             <map-meta name="zoom" content="min=0,max=5"></map-meta>
@@ -35,11 +35,11 @@
             <map-input  name="col" type="location" axis="column" units="tilematrix" min="0" max="2"></map-input>
             <map-link rel='tile' type='text/mapml' tref='https://maps.ecere.com/geoapi/collections/NaturalEarth/cultural/ne_10m_admin_0_countries/tiles/WorldCRS84Quad/{zoomLevel}/{row}/{col}.mapml' >
           </map-extent>-->
-        </layer->
+        </map-layer>
       </map>
       <map is="web-map" projection="OSMTILE" zoom="0" lat="0" lon="0" controls>
-        <layer- label="OpenStreetMap" src="../../../refactoring-temporary/osm.mapml" checked></layer->
-        <layer- label="Countries - WebMercatorQuad" checked>
+        <map-layer label="OpenStreetMap" src="../../../refactoring-temporary/osm.mapml" checked></map-layer>
+        <map-layer label="Countries - WebMercatorQuad" checked>
           <map-link rel="stylesheet" href="../vector-tile.css" ></map-link>
           <map-extent units="OSMTILE" checked hidden>
             <map-input  name="zoomLevel" type="zoom" min="0" max="2" value="0"></map-input>
@@ -48,7 +48,7 @@
             <!-- https://maps.ecere.com/ogcapi/collections/NaturalEarth:cultural:ne_10m_admin_0_countries/tiles/WebMercatorQuad/{zoomLevel}/{row}/{col}.mapml -->
             <map-link rel='tile' type='text/mapml' tref='../tiles/osmtile/{zoomLevel}/{row}/{col}.mapml' ></map-link>
           </map-extent>
-        </layer->
+        </map-layer>
       </map>
     </body>
 </html>
\ No newline at end of file
diff --git a/vector-tiles/pmtiles/index.html b/vector-tiles/pmtiles/index.html
index 2301005..1f93d56 100644
--- a/vector-tiles/pmtiles/index.html
+++ b/vector-tiles/pmtiles/index.html
@@ -33,7 +33,7 @@
         vertical-align: middle;
       }
 
-      /* Pre-style to avoid FOUC of inline layer- and fallback content. */
+      /* Pre-style to avoid FOUC of inline map-layer and fallback content. */
       mapml-viewer:not(:defined) > * {
         display: none;
       }
@@ -49,7 +49,7 @@
       supported, or if javascript is disabled. This needs to be defined separately 
       from the above, because the `:not(:defined)` selector invalidates the entire 
       declaration in browsers that do not support it. */
-      layer- {
+      map-layer {
         display: none;
       }
     </style> 
@@ -57,7 +57,7 @@
     <style>
       /* Ensure fallback content (children of the map element) is displayed if 
       custom/built-in elements is supported but javascript is disabled. */
-      mapml-viewer:not(:defined) > :not(layer-) {
+      mapml-viewer:not(:defined) > :not(map-layer) {
         display: initial;
       }
 
@@ -74,7 +74,7 @@
   <body>
 
   <mapml-viewer projection="OSMTILE" zoom="12" lat="44.436108753775116" lon="-103.75024795532228" controls controlslist="geolocation">
-    <layer- label="OpenStreetMap">
+    <map-layer label="OpenStreetMap">
       <map-link rel="license" title="© OpenStreetMap contributors CC BY-SA" href="https://www.openstreetmap.org/copyright"></map-link>
       <map-extent units="OSMTILE" checked="checked">
         <map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
@@ -82,9 +82,9 @@
         <map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
         <map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
       </map-extent>
-    </layer->
-    <layer- src="dark.mapml"></layer->
-    <layer- checked>
+    </map-layer>
+    <map-layer src="dark.mapml"></map-layer>
+    <map-layer checked>
       <map-title>Protomaps' {z}/{x}/{y}.mvt API - light theme</map-title>
       <map-link rel="stylesheet" type="application/pmtiles+stylesheet" href="lightTheme.js"></map-link>
       <map-link rel="license" title="© OpenStreetMap contributors CC BY-SA" href="https://www.openstreetmap.org/copyright"></map-link>
@@ -94,9 +94,9 @@
         <map-input name="y" type="location" units="tilematrix" axis="row" min="0" max="262144"></map-input>
         <map-link rel="tile" type="application/vnd.mapbox-vector-tile" tref="https://api.protomaps.com/tiles/v3/{z}/{x}/{y}.mvt?key=41392fb7515533a5"></map-link>
       </map-extent>
-    </layer->
+    </map-layer>
 
-<!--    <layer- label='Custom MVT test'>
+<!--    <map-layer label='Custom MVT test'>
 
       <map-extent units="OSMTILE" label="Spearfish" checked="checked">
         <map-input name="z" type="zoom" value="18" min="0" max="18"></map-input>
@@ -108,7 +108,7 @@
         <map-input name="j" type="location" axis="j" units="tile"></map-input>
         <map-link  rel="query" tref="http://localhost:8080/geoserver/gwc/service/wmts?request=GetFeatureInfo&format=image/jpeg&i={i}&j={j}&TileCol={x}&version=1.0.0&layer=spearfish&tilematrixset=OSMTILE&tilematrix={z}&TileRow={y}&service=WMTS&infoformat=text/mapml&feature_count=50&style="></map-link>
       </map-extent>
-    </layer->-->
+    </map-layer>-->
 
   </mapml-viewer>
 </body>