From 04459d1424810a36f6aa86f54f2165f62a14f981 Mon Sep 17 00:00:00 2001
From: Tom Kralidis <tomkralidis@gmail.com>
Date: Fri, 19 Oct 2018 14:59:22 +0000
Subject: [PATCH] fix MetadataURL type for Capabilities responses (#5680)

---
 mapmetadata.c                                      |  4 ++--
 msautotest/misc/expected/runtime_sub_test_caps.xml | 14 +++++++-------
 .../wxs/expected/ows_all_wms_capabilities.xml      |  4 ++--
 .../wxs/expected/ows_all_wms_capabilities_post.xml |  4 ++--
 .../expected/ows_metadata_wcs_capabilities100.xml  |  2 +-
 .../expected/ows_metadata_wfs_capabilities100.xml  |  2 +-
 .../expected/ows_metadata_wfs_capabilities110.xml  |  2 +-
 .../expected/ows_metadata_wms_capabilities111.xml  |  4 ++--
 .../expected/ows_metadata_wms_capabilities130.xml  |  4 ++--
 msautotest/wxs/expected/ows_wms_capabilities.xml   |  2 +-
 .../ows_wms_rootlayer_name_capabilities.xml        |  2 +-
 .../ows_wms_rootlayer_name_empty_capabilities.xml  |  2 +-
 ...s_describe_coverage_tileindexmixedsrs_26711.xml |  2 +-
 ...cs_get_capabilities_tileindexmixedsrs_26711.xml |  2 +-
 msautotest/wxs/expected/wcs_get_caps.xml           |  2 +-
 msautotest/wxs/expected/wfs11_cap_ogr.xml          |  2 +-
 .../wxs/expected/wfs11_caps_updatesequence_ogr.xml |  2 +-
 msautotest/wxs/expected/wfs_cap_ogr.xml            |  2 +-
 .../wxs/expected/wfs_caps_updatesequence_ogr.xml   |  2 +-
 msautotest/wxs/expected/wfsogr10_caps.xml          | 12 ++++++------
 msautotest/wxs/expected/wfsogr11_caps.xml          | 12 ++++++------
 .../wxs/expected/wms111_test_xml_escaping.xml      |  2 +-
 .../wxs/expected/wms130_test_xml_escaping.xml      |  2 +-
 msautotest/wxs/expected/wms_cap.xml                |  2 +-
 msautotest/wxs/expected/wms_cap130.xml             |  2 +-
 msautotest/wxs/expected/wms_cap130_postgis.xml     |  2 +-
 msautotest/wxs/expected/wms_cap_latestversion.xml  |  2 +-
 .../wxs/expected/wms_cap_latestversion_postgis.xml |  2 +-
 msautotest/wxs/expected/wms_cap_postgis.xml        |  2 +-
 .../wxs/expected/wms_caps_updatesequence.xml       |  2 +-
 .../expected/wms_caps_updatesequence_postgis.xml   |  2 +-
 msautotest/wxs/expected/wms_dimension_cap.xml      |  6 +++---
 msautotest/wxs/expected/wms_dimension_cap130.xml   |  6 +++---
 .../wms_get_capabilities_tileindexmixedsrs.xml     |  2 +-
 .../wxs/expected/wms_inspire_scenario1_cap130.xml  |  6 +++---
 .../expected/wms_inspire_scenario1_cap130_eng.xml  |  6 +++---
 .../expected/wms_inspire_scenario1_cap130_ger.xml  |  6 +++---
 .../wxs/expected/wms_inspire_scenario2_cap111.xml  |  6 +++---
 .../expected/wms_inspire_scenario2_cap111_eng.xml  |  6 +++---
 .../expected/wms_inspire_scenario2_cap111_ger.xml  |  6 +++---
 .../wxs/expected/wms_inspire_scenario2_cap130.xml  |  6 +++---
 .../expected/wms_inspire_scenario2_cap130_eng.xml  |  6 +++---
 .../expected/wms_inspire_scenario2_cap130_ger.xml  |  6 +++---
 .../wxs/expected/wms_layer_groups_caps111.xml      | 12 ++++++------
 .../wxs/expected/wms_north_polar_stereo_extent.xml |  2 +-
 msautotest/wxs/expected/wms_nosld_cap.xml          |  6 +++---
 msautotest/wxs/expected/wms_nosld_cap_postgis.xml  |  6 +++---
 msautotest/wxs/expected/wms_rast_cap.xml           |  4 ++--
 msautotest/wxs/expected/wms_time_cap.xml           |  2 +-
 msautotest/wxs/expected/wms_time_cap130.xml        |  2 +-
 .../expected/wms_time_cap130_postgis_postgis.xml   |  2 +-
 .../wxs/expected/wms_time_cap_postgis_postgis.xml  |  2 +-
 52 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/mapmetadata.c b/mapmetadata.c
index 9ea1a4ca55..32b20acb09 100644
--- a/mapmetadata.c
+++ b/mapmetadata.c
@@ -892,10 +892,10 @@ void msMetadataSetGetMetadataURL(layerObj *lp, const char *url)
   pszMetadataURL = msStringConcatenate(pszMetadataURL, lp->name);
 
   msInsertHashTable(&(lp->metadata), "ows_metadataurl_href", pszMetadataURL);
-  msInsertHashTable(&(lp->metadata), "ows_metadataurl_type", "ISOTC211/19115");
+  msInsertHashTable(&(lp->metadata), "ows_metadataurl_type", "TC211");
   msInsertHashTable(&(lp->metadata), "ows_metadataurl_format", "text/xml");
   msInsertHashTable(&(lp->metadata), "ows_metadatalink_href", pszMetadataURL);
-  msInsertHashTable(&(lp->metadata), "ows_metadatalink_type", "ISOTC211/19115");
+  msInsertHashTable(&(lp->metadata), "ows_metadatalink_type", "TC211");
   msInsertHashTable(&(lp->metadata), "ows_metadatalink_format", "text/xml");
   msFree(pszMetadataURL);
 }
diff --git a/msautotest/misc/expected/runtime_sub_test_caps.xml b/msautotest/misc/expected/runtime_sub_test_caps.xml
index 9d98d07eea..55ae169218 100644
--- a/msautotest/misc/expected/runtime_sub_test_caps.xml
+++ b/msautotest/misc/expected/runtime_sub_test_caps.xml
@@ -51,7 +51,7 @@ Content-Type: text/xml; charset=UTF-8
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>layer1</Title>
         <!-- WARNING: Optional Ex_GeographicBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer1"/>
         </MetadataURL>
@@ -61,7 +61,7 @@ Content-Type: text/xml; charset=UTF-8
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>layer2</Title>
         <!-- WARNING: Optional Ex_GeographicBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer2"/>
         </MetadataURL>
@@ -71,7 +71,7 @@ Content-Type: text/xml; charset=UTF-8
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>layer3</Title>
         <!-- WARNING: Optional Ex_GeographicBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer3"/>
         </MetadataURL>
@@ -88,7 +88,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:3857"
                     minx="123446" miny="4.76081e+06" maxx="801225" maxy="5.48737e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer5"/>
         </MetadataURL>
@@ -105,7 +105,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:3857"
                     minx="123446" miny="4.76081e+06" maxx="801225" maxy="5.48737e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer6"/>
         </MetadataURL>
@@ -122,7 +122,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:3857"
                     minx="123446" miny="4.76081e+06" maxx="801225" maxy="5.48737e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer7"/>
         </MetadataURL>
@@ -139,7 +139,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:3857"
                     minx="123446" miny="4.76081e+06" maxx="801225" maxy="5.48737e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo/?request=GetMetadata&amp;layer=layer8"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_all_wms_capabilities.xml b/msautotest/wxs/expected/ows_all_wms_capabilities.xml
index 7d5c0f4b43..1a14e42f42 100644
--- a/msautotest/wxs/expected/ows_all_wms_capabilities.xml
+++ b/msautotest/wxs/expected/ows_all_wms_capabilities.xml
@@ -150,7 +150,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
@@ -173,7 +173,7 @@ Content-Type: text/xml; charset=UTF-8
             <southBoundLatitude>41.7705</southBoundLatitude>
             <northBoundLatitude>48.4773</northBoundLatitude>
         </EX_GeographicBoundingBox>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml b/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
index 7d5c0f4b43..1a14e42f42 100644
--- a/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
+++ b/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
@@ -150,7 +150,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
@@ -173,7 +173,7 @@ Content-Type: text/xml; charset=UTF-8
             <southBoundLatitude>41.7705</southBoundLatitude>
             <northBoundLatitude>48.4773</northBoundLatitude>
         </EX_GeographicBoundingBox>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml b/msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml
index d8df2eb531..ca1acbbd7c 100644
--- a/msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml
+++ b/msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml
@@ -90,7 +90,7 @@ Content-Type: text/xml; charset=UTF-8
 </Capability>
 <ContentMetadata>
   <CoverageOfferingBrief>
-  <metadataLink metadataType="ISOTC211/19115" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=toronto"/>    <name>toronto</name>
+  <metadataLink metadataType="TC211" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=toronto"/>    <name>toronto</name>
     <label>Toronto</label>
     <lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
       <gml:pos>-117.54590357301 44.665615181923</gml:pos>
diff --git a/msautotest/wxs/expected/ows_metadata_wfs_capabilities100.xml b/msautotest/wxs/expected/ows_metadata_wfs_capabilities100.xml
index ab23608d54..f52c1ca097 100644
--- a/msautotest/wxs/expected/ows_metadata_wfs_capabilities100.xml
+++ b/msautotest/wxs/expected/ows_metadata_wfs_capabilities100.xml
@@ -90,7 +90,7 @@ Content-Type: text/xml; charset=UTF-8
         <Abstract>province</Abstract>
         <SRS>EPSG:4326</SRS>
         <LatLongBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/ows?request=GetMetadata&amp;layer=province</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/ows?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
 </FeatureTypeList>
 
diff --git a/msautotest/wxs/expected/ows_metadata_wfs_capabilities110.xml b/msautotest/wxs/expected/ows_metadata_wfs_capabilities110.xml
index 15e7d260c2..66521334ef 100644
--- a/msautotest/wxs/expected/ows_metadata_wfs_capabilities110.xml
+++ b/msautotest/wxs/expected/ows_metadata_wfs_capabilities110.xml
@@ -121,7 +121,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.724329085098 41.770507630784</ows:LowerCorner>
         <ows:UpperCorner>-57.721680231574 48.477313848494</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/ows?request=GetMetadata&amp;layer=province</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/ows?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
   </FeatureTypeList>
   <ogc:Filter_Capabilities>
diff --git a/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml b/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml
index 249e424d15..eeed38cfb8 100644
--- a/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml
+++ b/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml
@@ -163,7 +163,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <Title>province</Title>
         <Abstract>province</Abstract>
         <LatLonBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
@@ -184,7 +184,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-117.546" miny="44.6656" maxx="-117.387" maxy="44.7671" />
         <BoundingBox SRS="EPSG:32611"
                     minx="456800" miny="4.94595e+06" maxx="469300" maxy="4.95715e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=toronto"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml b/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml
index 76b74902f3..694480b4bd 100644
--- a/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml
+++ b/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml
@@ -174,7 +174,7 @@ Content-Type: text/xml; charset=UTF-8
             <southBoundLatitude>41.7705</southBoundLatitude>
             <northBoundLatitude>48.4773</northBoundLatitude>
         </EX_GeographicBoundingBox>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
@@ -200,7 +200,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:32611"
                     minx="456800" miny="4.94595e+06" maxx="469300" maxy="4.95715e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/ows?request=GetMetadata&amp;layer=toronto"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_wms_capabilities.xml b/msautotest/wxs/expected/ows_wms_capabilities.xml
index 574ba1ce30..ed44015371 100644
--- a/msautotest/wxs/expected/ows_wms_capabilities.xml
+++ b/msautotest/wxs/expected/ows_wms_capabilities.xml
@@ -90,7 +90,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=road2"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml b/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml
index 27feec176f..02cd5b28f6 100644
--- a/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml
+++ b/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml
@@ -90,7 +90,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=road2"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml b/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml
index 83b8ebf820..682fcb61b6 100644
--- a/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml
+++ b/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml
@@ -89,7 +89,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows?request=GetMetadata&amp;layer=road2"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml b/msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml
index f6c6f20120..9df340dd12 100644
--- a/msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml
+++ b/msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml
@@ -10,7 +10,7 @@ Content-Type: text/xml; charset=UTF-8
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.opengis.net/wcs http://schemas.opengis.net/wcs/1.0.0/describeCoverage.xsd">
   <CoverageOffering>
-  <metadataLink metadataType="ISOTC211/19115" xlink:type="simple" xlink:href="http://localhost/path/to/?request=GetMetadata&amp;layer=grey_26711"/>  <name>grey_26711</name>
+  <metadataLink metadataType="TC211" xlink:type="simple" xlink:href="http://localhost/path/to/?request=GetMetadata&amp;layer=grey_26711"/>  <name>grey_26711</name>
   <label>grey_26711</label>
     <lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
       <gml:pos>-117.64116862079 33.848239887018</gml:pos>
diff --git a/msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml b/msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml
index fe5006e768..b08ec217d6 100644
--- a/msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml
+++ b/msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml
@@ -62,7 +62,7 @@ Content-Type: text/xml; charset=UTF-8
 </Capability>
 <ContentMetadata>
   <CoverageOfferingBrief>
-  <metadataLink metadataType="ISOTC211/19115" xlink:type="simple" xlink:href="http://localhost/path/to/?request=GetMetadata&amp;layer=grey_26711"/>    <name>grey_26711</name>
+  <metadataLink metadataType="TC211" xlink:type="simple" xlink:href="http://localhost/path/to/?request=GetMetadata&amp;layer=grey_26711"/>    <name>grey_26711</name>
     <label>grey_26711</label>
     <lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
       <gml:pos>-117.64116862079 33.848239887018</gml:pos>
diff --git a/msautotest/wxs/expected/wcs_get_caps.xml b/msautotest/wxs/expected/wcs_get_caps.xml
index e798ec0f77..5296b96a10 100644
--- a/msautotest/wxs/expected/wcs_get_caps.xml
+++ b/msautotest/wxs/expected/wcs_get_caps.xml
@@ -86,7 +86,7 @@
 </Capability>
 <ContentMetadata>
   <CoverageOfferingBrief>
-  <metadataLink metadataType="ISOTC211/19115" xlink:type="simple" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;request=GetMetadata&amp;layer=land_shallow_topo_2048"/>    <name>land_shallow_topo_2048</name>
+  <metadataLink metadataType="TC211" xlink:type="simple" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;request=GetMetadata&amp;layer=land_shallow_topo_2048"/>    <name>land_shallow_topo_2048</name>
 <!-- WARNING: Mandatory metadata '..._label' was missing in this context. -->
     <lonLatEnvelope srsName="urn:ogc:def:crs:OGC:1.3:CRS84">
       <gml:pos>-180.351562 -89.648437</gml:pos>
diff --git a/msautotest/wxs/expected/wfs11_cap_ogr.xml b/msautotest/wxs/expected/wfs11_cap_ogr.xml
index a5e3af0c7c..91c425cbcb 100644
--- a/msautotest/wxs/expected/wfs11_cap_ogr.xml
+++ b/msautotest/wxs/expected/wfs11_cap_ogr.xml
@@ -106,7 +106,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.724329085098 41.770507630784</ows:LowerCorner>
         <ows:UpperCorner>-57.721680231574 48.477313848494</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
   </FeatureTypeList>
   <ogc:Filter_Capabilities>
diff --git a/msautotest/wxs/expected/wfs11_caps_updatesequence_ogr.xml b/msautotest/wxs/expected/wfs11_caps_updatesequence_ogr.xml
index a5e3af0c7c..91c425cbcb 100644
--- a/msautotest/wxs/expected/wfs11_caps_updatesequence_ogr.xml
+++ b/msautotest/wxs/expected/wfs11_caps_updatesequence_ogr.xml
@@ -106,7 +106,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.724329085098 41.770507630784</ows:LowerCorner>
         <ows:UpperCorner>-57.721680231574 48.477313848494</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
   </FeatureTypeList>
   <ogc:Filter_Capabilities>
diff --git a/msautotest/wxs/expected/wfs_cap_ogr.xml b/msautotest/wxs/expected/wfs_cap_ogr.xml
index f259480fe2..3e26278de8 100644
--- a/msautotest/wxs/expected/wfs_cap_ogr.xml
+++ b/msautotest/wxs/expected/wfs_cap_ogr.xml
@@ -80,7 +80,7 @@ Content-Type: text/xml; charset=UTF-8
         <Title>province</Title>
         <SRS>EPSG:4326</SRS>
         <LatLongBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
 </FeatureTypeList>
 
diff --git a/msautotest/wxs/expected/wfs_caps_updatesequence_ogr.xml b/msautotest/wxs/expected/wfs_caps_updatesequence_ogr.xml
index f259480fe2..3e26278de8 100644
--- a/msautotest/wxs/expected/wfs_caps_updatesequence_ogr.xml
+++ b/msautotest/wxs/expected/wfs_caps_updatesequence_ogr.xml
@@ -80,7 +80,7 @@ Content-Type: text/xml; charset=UTF-8
         <Title>province</Title>
         <SRS>EPSG:4326</SRS>
         <LatLongBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=province</MetadataURL>
     </FeatureType>
 </FeatureTypeList>
 
diff --git a/msautotest/wxs/expected/wfsogr10_caps.xml b/msautotest/wxs/expected/wfsogr10_caps.xml
index 028eb3dfcd..1082857629 100644
--- a/msautotest/wxs/expected/wfsogr10_caps.xml
+++ b/msautotest/wxs/expected/wfsogr10_caps.xml
@@ -89,42 +89,42 @@ Content-Type: text/xml; charset=UTF-8
         <Title>road</Title>
         <SRS>EPSG:3978</SRS>
         <LatLongBoundingBox minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road</MetadataURL>
     </FeatureType>
     <FeatureType>
         <Name>popplace</Name>
         <Title>popplace</Title>
         <SRS>EPSG:3978</SRS>
         <LatLongBoundingBox minx="2.2794e+06" miny="-55344.5" maxx="2.60038e+06" maxy="461587" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=popplace</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=popplace</MetadataURL>
     </FeatureType>
     <FeatureType>
         <Name>road_with_addfiles</Name>
         <Title>road_with_addfiles</Title>
         <SRS>EPSG:3978</SRS>
         <LatLongBoundingBox minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road_with_addfiles</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road_with_addfiles</MetadataURL>
     </FeatureType>
     <FeatureType>
         <Name>road2_with_addfiles</Name>
         <Title>road2_with_addfiles</Title>
         <SRS>EPSG:3978</SRS>
         <LatLongBoundingBox minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road2_with_addfiles</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road2_with_addfiles</MetadataURL>
     </FeatureType>
     <FeatureType>
         <Name>multi</Name>
         <Title>multi</Title>
         <SRS>EPSG:27700</SRS>
         <LatLongBoundingBox minx="0" miny="0" maxx="100" maxy="100" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=multi</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=multi</MetadataURL>
     </FeatureType>
     <FeatureType>
         <Name>withnullvalues</Name>
         <Title>withnullvalues</Title>
         <SRS>EPSG:27700</SRS>
         <LatLongBoundingBox minx="10" miny="30" maxx="10" maxy="30" />
-        <MetadataURL type="ISOTC211/19115" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=withnullvalues</MetadataURL>
+        <MetadataURL type="TC211" format="text/xml">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=withnullvalues</MetadataURL>
     </FeatureType>
 </FeatureTypeList>
 
diff --git a/msautotest/wxs/expected/wfsogr11_caps.xml b/msautotest/wxs/expected/wfsogr11_caps.xml
index 1d2064f156..ebebe16061 100644
--- a/msautotest/wxs/expected/wfsogr11_caps.xml
+++ b/msautotest/wxs/expected/wfsogr11_caps.xml
@@ -122,7 +122,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.633317770969 42.382053788395</ows:LowerCorner>
         <ows:UpperCorner>-59.292113839180 48.295511938680</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road</MetadataURL>
     </FeatureType>
     <FeatureType>
       <Name>popplace</Name>
@@ -141,7 +141,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.328616887533 42.5631251681</ows:LowerCorner>
         <ows:UpperCorner>-59.688212172925 47.941250727064</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=popplace</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=popplace</MetadataURL>
     </FeatureType>
     <FeatureType>
       <Name>road_with_addfiles</Name>
@@ -162,7 +162,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.633317770969 42.382053788395</ows:LowerCorner>
         <ows:UpperCorner>-59.292113839180 48.295511938680</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road_with_addfiles</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road_with_addfiles</MetadataURL>
     </FeatureType>
     <FeatureType>
       <Name>road2_with_addfiles</Name>
@@ -183,7 +183,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-66.633317770969 42.382053788395</ows:LowerCorner>
         <ows:UpperCorner>-59.292113839180 48.295511938680</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road2_with_addfiles</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=road2_with_addfiles</MetadataURL>
     </FeatureType>
     <FeatureType>
       <Name>multi</Name>
@@ -200,7 +200,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-7.5572625062256 49.76680723189</ows:LowerCorner>
         <ows:UpperCorner>-7.5557777787773 49.767768904154</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=multi</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=multi</MetadataURL>
     </FeatureType>
     <FeatureType>
       <Name>withnullvalues</Name>
@@ -218,7 +218,7 @@ Content-Type: text/xml; charset=UTF-8
         <ows:LowerCorner>-7.5570524339304 49.767082436309</ows:LowerCorner>
         <ows:UpperCorner>-7.5570524339304 49.767082436309</ows:UpperCorner>
       </ows:WGS84BoundingBox>
-      <MetadataURL format="text/xml" type="ISOTC211/19115">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=withnullvalues</MetadataURL>
+      <MetadataURL format="text/xml" type="TC211">http://localhost/path/to/wfs_simple?request=GetMetadata&amp;layer=withnullvalues</MetadataURL>
     </FeatureType>
   </FeatureTypeList>
   <ogc:Filter_Capabilities>
diff --git a/msautotest/wxs/expected/wms111_test_xml_escaping.xml b/msautotest/wxs/expected/wms111_test_xml_escaping.xml
index d662a30989..c2bd5075fb 100644
--- a/msautotest/wxs/expected/wms111_test_xml_escaping.xml
+++ b/msautotest/wxs/expected/wms111_test_xml_escaping.xml
@@ -133,7 +133,7 @@
         <Title>title&amp;title</Title>
         <Abstract>abstract&amp;abstract</Abstract>
         <LatLonBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows_test_xml_escaping?myparam=something&amp;request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms130_test_xml_escaping.xml b/msautotest/wxs/expected/wms130_test_xml_escaping.xml
index a6c8aacaee..df4dd874e2 100644
--- a/msautotest/wxs/expected/wms130_test_xml_escaping.xml
+++ b/msautotest/wxs/expected/wms130_test_xml_escaping.xml
@@ -139,7 +139,7 @@
             <southBoundLatitude>41.7705</southBoundLatitude>
             <northBoundLatitude>48.4773</northBoundLatitude>
         </EX_GeographicBoundingBox>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/ows_test_xml_escaping?myparam=something&amp;request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap.xml b/msautotest/wxs/expected/wms_cap.xml
index 88b9095665..e4cfbbaad6 100644
--- a/msautotest/wxs/expected/wms_cap.xml
+++ b/msautotest/wxs/expected/wms_cap.xml
@@ -134,7 +134,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap130.xml b/msautotest/wxs/expected/wms_cap130.xml
index 367996a462..29ff6575bb 100644
--- a/msautotest/wxs/expected/wms_cap130.xml
+++ b/msautotest/wxs/expected/wms_cap130.xml
@@ -141,7 +141,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap130_postgis.xml b/msautotest/wxs/expected/wms_cap130_postgis.xml
index 367996a462..29ff6575bb 100644
--- a/msautotest/wxs/expected/wms_cap130_postgis.xml
+++ b/msautotest/wxs/expected/wms_cap130_postgis.xml
@@ -141,7 +141,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap_latestversion.xml b/msautotest/wxs/expected/wms_cap_latestversion.xml
index 367996a462..29ff6575bb 100644
--- a/msautotest/wxs/expected/wms_cap_latestversion.xml
+++ b/msautotest/wxs/expected/wms_cap_latestversion.xml
@@ -141,7 +141,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap_latestversion_postgis.xml b/msautotest/wxs/expected/wms_cap_latestversion_postgis.xml
index 367996a462..29ff6575bb 100644
--- a/msautotest/wxs/expected/wms_cap_latestversion_postgis.xml
+++ b/msautotest/wxs/expected/wms_cap_latestversion_postgis.xml
@@ -141,7 +141,7 @@ Content-Type: text/xml; charset=UTF-8
         </EX_GeographicBoundingBox>
         <BoundingBox CRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_cap_postgis.xml b/msautotest/wxs/expected/wms_cap_postgis.xml
index 88b9095665..e4cfbbaad6 100644
--- a/msautotest/wxs/expected/wms_cap_postgis.xml
+++ b/msautotest/wxs/expected/wms_cap_postgis.xml
@@ -134,7 +134,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_caps_updatesequence.xml b/msautotest/wxs/expected/wms_caps_updatesequence.xml
index 88b9095665..e4cfbbaad6 100644
--- a/msautotest/wxs/expected/wms_caps_updatesequence.xml
+++ b/msautotest/wxs/expected/wms_caps_updatesequence.xml
@@ -134,7 +134,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml b/msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml
index 88b9095665..e4cfbbaad6 100644
--- a/msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml
+++ b/msautotest/wxs/expected/wms_caps_updatesequence_postgis.xml
@@ -134,7 +134,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:43204"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_dimension_cap.xml b/msautotest/wxs/expected/wms_dimension_cap.xml
index aa551c3e93..65e7bb18e0 100644
--- a/msautotest/wxs/expected/wms_dimension_cap.xml
+++ b/msautotest/wxs/expected/wms_dimension_cap.xml
@@ -95,7 +95,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <Extent name="elevation" default="500" nearestValue="0">500, 490, 480</Extent>
         <Dimension name="text_dimension" units="my_units"/>
         <Extent name="text_dimension" nearestValue="0">first, second, third</Extent>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev"/>
         </MetadataURL>
@@ -117,7 +117,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
                     minx="0.00017826" miny="-0.00213" maxx="0.003420" maxy="0.00031377" />
         <Dimension name="elevation" units="meters"/>
         <Extent name="elevation" nearestValue="0">490/800</Extent>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev_range"/>
         </MetadataURL>
@@ -139,7 +139,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
                     minx="0.00017826" miny="-0.00213" maxx="0.003420" maxy="0.00031377" />
         <Dimension name="elevation" units="meters"/>
         <Extent name="elevation" nearestValue="0">480/500,800/900</Extent>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev_multi_range"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_dimension_cap130.xml b/msautotest/wxs/expected/wms_dimension_cap130.xml
index 0e76566bef..94e69f49e9 100644
--- a/msautotest/wxs/expected/wms_dimension_cap130.xml
+++ b/msautotest/wxs/expected/wms_dimension_cap130.xml
@@ -121,7 +121,7 @@ Content-Type: text/xml; charset=UTF-8
                     minx="-0.00213" miny="0.00017826" maxx="0.00031377" maxy="0.003420" />
         <Dimension name="elevation" units="meters" default="500" multipleValues="1" nearestValue="0">500, 490, 480</Dimension>
         <Dimension name="text_dimension" units="my_units"  multipleValues="1"  nearestValue="0">first, second, third</Dimension>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev"/>
         </MetadataURL>
@@ -147,7 +147,7 @@ Content-Type: text/xml; charset=UTF-8
         <BoundingBox CRS="EPSG:4326"
                     minx="-0.00213" miny="0.00017826" maxx="0.00031377" maxy="0.003420" />
         <Dimension name="elevation" units="meters"  multipleValues="1"  nearestValue="0">490/800</Dimension>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev_range"/>
         </MetadataURL>
@@ -173,7 +173,7 @@ Content-Type: text/xml; charset=UTF-8
         <BoundingBox CRS="EPSG:4326"
                     minx="-0.00213" miny="0.00017826" maxx="0.00031377" maxy="0.003420" />
         <Dimension name="elevation" units="meters"  multipleValues="1"  nearestValue="0">480/500,800/900</Dimension>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?request=GetMetadata&amp;layer=lakes_elev_multi_range"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml b/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
index 81cc90b11b..b4f9452475 100644
--- a/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
+++ b/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
@@ -89,7 +89,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-117.641" miny="33.848" maxx="-117.576" maxy="33.9027" />
         <BoundingBox SRS="EPSG:26711"
                     minx="440682" miny="3.74525e+06" maxx="446743" maxy="3.75136e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/?request=GetMetadata&amp;layer=grey"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
index b77bea3bb4..1c1e621bee 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
@@ -146,7 +146,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -191,7 +191,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -224,7 +224,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
index b77bea3bb4..1c1e621bee 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
@@ -146,7 +146,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -191,7 +191,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -224,7 +224,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
index 86673dd697..c93d3b8394 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
@@ -146,7 +146,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -191,7 +191,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -224,7 +224,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
index 02bf3ee15d..0ba1cc48f4 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
@@ -155,7 +155,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -195,7 +195,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -223,7 +223,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
index 02bf3ee15d..0ba1cc48f4 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
@@ -155,7 +155,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -195,7 +195,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -223,7 +223,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
index d8900729ad..c8d97cb258 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
@@ -155,7 +155,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -195,7 +195,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -223,7 +223,7 @@
                     minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3035"
                     minx="-622089" miny="4.90936e+06" maxx="-91098.1" maxy="5.34642e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
index c18718ed55..e53959b7cf 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
@@ -161,7 +161,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -206,7 +206,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -239,7 +239,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
index c18718ed55..e53959b7cf 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
@@ -161,7 +161,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -206,7 +206,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -239,7 +239,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=eng&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
index 7384f0c493..cc437ff81b 100644
--- a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
+++ b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
@@ -161,7 +161,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RoadTransportNetwork.RoadLink"/>
         </MetadataURL>
@@ -206,7 +206,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.RailTransportNetwork.RailwayLink"/>
         </MetadataURL>
@@ -239,7 +239,7 @@
                     minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
         <BoundingBox CRS="EPSG:3035"
                     minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...?language=ger&amp;request=GetMetadata&amp;layer=TN.AirTransportNetwork.AirLink"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_layer_groups_caps111.xml b/msautotest/wxs/expected/wms_layer_groups_caps111.xml
index 4c8aa67886..33f0c99cef 100644
--- a/msautotest/wxs/expected/wms_layer_groups_caps111.xml
+++ b/msautotest/wxs/expected/wms_layer_groups_caps111.xml
@@ -115,7 +115,7 @@
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>g1sg1l1</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g1sg1l1"/>
         </MetadataURL>
@@ -125,7 +125,7 @@
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>g1sg1l2</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g1sg1l2"/>
         </MetadataURL>
@@ -139,7 +139,7 @@
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>g1sg2l1</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g1sg2l1"/>
         </MetadataURL>
@@ -157,7 +157,7 @@
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>g2sg3l1</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g2sg3l1"/>
         </MetadataURL>
@@ -168,7 +168,7 @@
         <Name>g3</Name>
         <Title>My g3</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g3"/>
         </MetadataURL>
@@ -180,7 +180,7 @@
 <!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
         <Title>g3sg4l1</Title>
         <!-- WARNING: Optional LatLonBoundingBox could not be established for this layer.  Consider setting the EXTENT in the LAYER object, or wms_extent metadata. Also check that your data exists in the DATA statement -->
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://foo?request=GetMetadata&amp;layer=g3sg4l1"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_north_polar_stereo_extent.xml b/msautotest/wxs/expected/wms_north_polar_stereo_extent.xml
index 155a582617..edaf213b7a 100644
--- a/msautotest/wxs/expected/wms_north_polar_stereo_extent.xml
+++ b/msautotest/wxs/expected/wms_north_polar_stereo_extent.xml
@@ -142,7 +142,7 @@ Content-Type: text/xml; charset=UTF-8
             <southBoundLatitude>27.6287</southBoundLatitude>
             <northBoundLatitude>69.9699</northBoundLatitude>
         </EX_GeographicBoundingBox>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=fake"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_nosld_cap.xml b/msautotest/wxs/expected/wms_nosld_cap.xml
index ef2b128845..c05684b4e7 100644
--- a/msautotest/wxs/expected/wms_nosld_cap.xml
+++ b/msautotest/wxs/expected/wms_nosld_cap.xml
@@ -79,7 +79,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <Name>province</Name>
         <Title>province</Title>
         <LatLonBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
@@ -96,7 +96,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <Name>popplace</Name>
         <Title>popplace</Title>
         <LatLonBoundingBox minx="-66.3286" miny="42.5631" maxx="-59.6882" maxy="47.9413" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=popplace"/>
         </MetadataURL>
@@ -113,7 +113,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <Name>road</Name>
         <Title>road</Title>
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_nosld_cap_postgis.xml b/msautotest/wxs/expected/wms_nosld_cap_postgis.xml
index 948fd4fe6a..474a0912ce 100644
--- a/msautotest/wxs/expected/wms_nosld_cap_postgis.xml
+++ b/msautotest/wxs/expected/wms_nosld_cap_postgis.xml
@@ -82,7 +82,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
         <BoundingBox SRS="EPSG:3978"
                     minx="2.25336e+06" miny="-76361.8" maxx="2.74765e+06" maxy="515489" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=province"/>
         </MetadataURL>
@@ -102,7 +102,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.3286" miny="42.5631" maxx="-59.6882" maxy="47.9413" />
         <BoundingBox SRS="EPSG:3978"
                     minx="2.2794e+06" miny="-55344.5" maxx="2.60038e+06" maxy="461587" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=popplace"/>
         </MetadataURL>
@@ -122,7 +122,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
         <BoundingBox SRS="EPSG:3978"
                     minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_rast_cap.xml b/msautotest/wxs/expected/wms_rast_cap.xml
index a22df5a665..20e56c80b8 100644
--- a/msautotest/wxs/expected/wms_rast_cap.xml
+++ b/msautotest/wxs/expected/wms_rast_cap.xml
@@ -134,7 +134,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-117.546" miny="44.6656" maxx="-117.387" maxy="44.7671" />
         <BoundingBox SRS="EPSG:32611"
                     minx="456800" miny="4.94595e+06" maxx="469300" maxy="4.95715e+06" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=road"/>
         </MetadataURL>
@@ -148,7 +148,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
         <LatLonBoundingBox minx="-121.489" miny="0" maxx="-121.485" maxy="0.0027058" />
         <BoundingBox SRS="EPSG:32611"
                     minx="0" miny="0" maxx="400" maxy="300" />
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?request=GetMetadata&amp;layer=grey"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_time_cap.xml b/msautotest/wxs/expected/wms_time_cap.xml
index 852b002a13..e851db1594 100644
--- a/msautotest/wxs/expected/wms_time_cap.xml
+++ b/msautotest/wxs/expected/wms_time_cap.xml
@@ -87,7 +87,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
                     minx="-131.02" miny="33.65" maxx="-119.85" maxy="48.39" />
         <Dimension name="time" units="ISO8601"/>
         <Extent name="time" nearestValue="0">2004-01-01/2004-02-01</Extent>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms_time?request=GetMetadata&amp;layer=pattern4"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_time_cap130.xml b/msautotest/wxs/expected/wms_time_cap130.xml
index 9fd6c52d0f..dd3de2d453 100644
--- a/msautotest/wxs/expected/wms_time_cap130.xml
+++ b/msautotest/wxs/expected/wms_time_cap130.xml
@@ -115,7 +115,7 @@ Content-Type: text/xml; charset=UTF-8
         <BoundingBox CRS="EPSG:4326"
                     minx="33.65" miny="-131.02" maxx="48.39" maxy="-119.85" />
         <Dimension name="time" units="ISO8601" nearestValue="0">2004-01-01/2004-02-01</Dimension>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms_time?request=GetMetadata&amp;layer=pattern4"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml b/msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml
index 9fd6c52d0f..dd3de2d453 100644
--- a/msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml
+++ b/msautotest/wxs/expected/wms_time_cap130_postgis_postgis.xml
@@ -115,7 +115,7 @@ Content-Type: text/xml; charset=UTF-8
         <BoundingBox CRS="EPSG:4326"
                     minx="33.65" miny="-131.02" maxx="48.39" maxy="-119.85" />
         <Dimension name="time" units="ISO8601" nearestValue="0">2004-01-01/2004-02-01</Dimension>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms_time?request=GetMetadata&amp;layer=pattern4"/>
         </MetadataURL>
diff --git a/msautotest/wxs/expected/wms_time_cap_postgis_postgis.xml b/msautotest/wxs/expected/wms_time_cap_postgis_postgis.xml
index 852b002a13..e851db1594 100644
--- a/msautotest/wxs/expected/wms_time_cap_postgis_postgis.xml
+++ b/msautotest/wxs/expected/wms_time_cap_postgis_postgis.xml
@@ -87,7 +87,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
                     minx="-131.02" miny="33.65" maxx="-119.85" maxy="48.39" />
         <Dimension name="time" units="ISO8601"/>
         <Extent name="time" nearestValue="0">2004-01-01/2004-02-01</Extent>
-        <MetadataURL type="ISOTC211/19115">
+        <MetadataURL type="TC211">
           <Format>text/xml</Format>
           <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms_time?request=GetMetadata&amp;layer=pattern4"/>
         </MetadataURL>