From 9157545afd03cd4882c9cd8e9c83f7a2025d3ff3 Mon Sep 17 00:00:00 2001
From: ByronCinNZ <cochranes4@eml.cc>
Date: Wed, 16 Aug 2023 09:28:11 +1200
Subject: [PATCH] Create a copy of iso19115-3.2018 to provide a base for GNSS
 profile. Modify template names to avoid conflicts

---
 .../ISO19115-3-2014-to-ISO19115-3-2018.xsl    |   4 +-
 .../ISO19139-to-ISO19115-3-2018.xsl           |   2 +-
 schemas/iso19115-3.2018GNSS/README.md         |   4 +-
 schemas/iso19115-3.2018GNSS/pom.xml           |   2 +-
 .../iso19115-3.2018GNSS/extract-relations.xsl |   6 +-
 .../formatter/citation/base.xsl               |  20 ++--
 .../formatter/citation/common.xsl             |   2 +-
 .../formatter/citation/view.xsl               |   4 +-
 .../formatter/datacite/view.xsl               |   2 +-
 .../formatter/jsonld/view.xsl                 |   2 +-
 .../formatter/xsl-view/view.xsl               |  26 ++---
 .../index-fields/link-utility.xsl             |   8 +-
 .../layout/config-editor.xml                  |  28 ++---
 .../iso19115-3.2018GNSS/layout/dispatcher.xsl |   6 +-
 .../iso19115-3.2018GNSS/layout/evaluate.xsl   |   4 +-
 .../layout/layout-custom-fields-contact.xsl   |   8 +-
 .../layout/layout-custom-fields-date.xsl      |  10 +-
 .../layout/layout-custom-fields-keywords.xsl  |  18 ++--
 .../layout/layout-custom-fields.xsl           |  40 +++----
 .../iso19115-3.2018GNSS/layout/layout.xsl     |  42 ++++----
 .../iso19115-3.2018GNSS/layout/tpl-brief.xsl  | 101 +++++++++++++-----
 .../iso19115-3.2018GNSS/layout/tpl-csv.xsl    |   4 +-
 .../iso19115-3.2018GNSS/layout/utility-fn.xsl |  16 +--
 .../layout/utility-tpl-multilingual.xsl       |  18 ++--
 .../layout/utility-tpl.xsl                    |   8 +-
 .../layout/utility-vacuum.xsl                 |  20 ++--
 .../iso19115-3.2018GNSS/loc/eng/strings.xml   |   4 +-
 .../present/csw/csw-brief.xsl                 |   2 +-
 .../present/csw/csw-full.xsl                  |  26 ++---
 .../present/csw/csw-summary.xsl               |   2 +-
 .../process/add-date-for-status-common.xsl    |  12 +--
 .../create-featurecatalogue-from-wfs.xsl      |   2 +-
 .../process/dataset-add.xsl                   |   6 +-
 .../process/dq-report-add.xsl                 |  20 ++--
 .../process/fcats-file-add.xsl                |   6 +-
 .../process/legend-add.xsl                    |   2 +-
 .../process/onlinesrc-add.xsl                 |  14 +--
 .../process/process-utility.xsl               |   2 +-
 .../process/service-add.xsl                   |   4 +-
 .../process/thumbnail-add.xsl                 |   4 +-
 .../iso19115-3.2018GNSS/schema-ident.xml      |  24 ++---
 .../update-fixed-info-subtemplate.xsl         |   2 +-
 .../iso19115-3.2018GNSS/update-fixed-info.xsl |  12 +--
 .../resources/config-spring-geonetwork.xml    |   4 +-
 44 files changed, 295 insertions(+), 258 deletions(-)

diff --git a/schemas/iso19115-3.2018GNSS/ISO19115-3-2014-to-ISO19115-3-2018.xsl b/schemas/iso19115-3.2018GNSS/ISO19115-3-2014-to-ISO19115-3-2018.xsl
index 3b6b594dde1..2bc44e44a17 100644
--- a/schemas/iso19115-3.2018GNSS/ISO19115-3-2014-to-ISO19115-3-2018.xsl
+++ b/schemas/iso19115-3.2018GNSS/ISO19115-3-2014-to-ISO19115-3-2018.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:include href="../../../WEB-INF/data/config/schema_plugins/iso19115-3.2018/convert/ISO19139/fromISO19115-3.2014.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
+<xsl:include href="../../../WEB-INF/data/config/schema_plugins/iso19115-3.2018GNSS/convert/ISO19139/fromISO19115-3.2014.xsl"/>
+</xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018GNSS/ISO19139-to-ISO19115-3-2018.xsl b/schemas/iso19115-3.2018GNSS/ISO19139-to-ISO19115-3-2018.xsl
index 7526569c4ba..957c4652370 100644
--- a/schemas/iso19115-3.2018GNSS/ISO19139-to-ISO19115-3-2018.xsl
+++ b/schemas/iso19115-3.2018GNSS/ISO19139-to-ISO19115-3-2018.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:include href="../../../WEB-INF/data/config/schema_plugins/iso19115-3.2018/convert/ISO19139/fromISO19139.xsl"/>
+  <xsl:include href="../../../WEB-INF/data/config/schema_plugins/iso19115-3.2018GNSS/convert/ISO19139/fromISO19139.xsl"/>
 </xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018GNSS/README.md b/schemas/iso19115-3.2018GNSS/README.md
index 8cca89fc2ba..45fbdf25158 100644
--- a/schemas/iso19115-3.2018GNSS/README.md
+++ b/schemas/iso19115-3.2018GNSS/README.md
@@ -95,7 +95,7 @@ Nevertheless, the citation code is also indexed.
 
 ### Validation
 
-Validation steps are first XSD validation made on the schema, then the schematron validation defined in folder  [iso19115-3.2018/schematron](https://github.com/geonetwork/core-geonetwork/tree/master/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/schematron). 2 famillies of rules are available:
+Validation steps are first XSD validation made on the schema, then the schematron validation defined in folder  [iso19115-3.2018GNSS/schematron](https://github.com/geonetwork/core-geonetwork/tree/master/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/schematron). 2 famillies of rules are available:
 * ISO rules (defined by TC211)
 * INSPIRE rules
 
@@ -103,7 +103,7 @@ Validation steps are first XSD validation made on the schema, then the schematro
 ## CSW requests:
 
 If requesting using output schema http://www.isotc211.org/2005/gmd an ISO19139 record is returned. 
-To retrieve the record in ISO19115-3.2018, use http://standards.iso.org/iso/19115/-3/mdb/2.0 output schema.
+To retrieve the record in ISO19115-3.2018GNSS, use http://standards.iso.org/iso/19115/-3/mdb/2.0 output schema.
 ```xml
 <?xml version="1.0"?>
 <csw:GetRecordById xmlns:csw="http://www.opengis.net/cat/csw/2.0.2"
diff --git a/schemas/iso19115-3.2018GNSS/pom.xml b/schemas/iso19115-3.2018GNSS/pom.xml
index 906c414dd0c..297e572d5cd 100644
--- a/schemas/iso19115-3.2018GNSS/pom.xml
+++ b/schemas/iso19115-3.2018GNSS/pom.xml
@@ -51,7 +51,7 @@
         <directory>src/test/resources</directory>
       </testResource>
       <testResource>
-        <directory>src/main/plugin/iso19115-3.2018</directory>
+        <directory>src/main/plugin/iso19115-3.2018GNSS</directory>
       </testResource>
     </testResources>
 
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/extract-relations.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/extract-relations.xsl
index 3dc412b0423..c4616231b74 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/extract-relations.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/extract-relations.xsl
@@ -9,7 +9,7 @@
   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
   xmlns:gmx="http://standards.iso.org/iso/19115/-3/gmx"
   xmlns:gn="http://www.fao.org/geonetwork"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
   xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
   xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
@@ -30,11 +30,11 @@
         <item>
           <id><xsl:value-of select="mcc:fileName/gco:CharacterString"/></id>
           <url>
-              <xsl:apply-templates mode="get-iso19115-3.2018-localized-string"
+              <xsl:apply-templates mode="get-iso19115-3.2018GNSS-localized-string"
                                     select="mcc:fileName"/>
           </url>
           <title>
-              <xsl:apply-templates mode="get-iso19115-3.2018-localized-string"
+              <xsl:apply-templates mode="get-iso19115-3.2018GNSS-localized-string"
                                    select="mcc:fileDescription"/>
           </title>
           <type>thumbnail</type>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/base.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/base.xsl
index 2408170f582..c83c7532d4c 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/base.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/base.xsl
@@ -9,7 +9,7 @@
                 xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:saxon="http://saxon.sf.net/"
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
@@ -18,12 +18,12 @@
   <xsl:import href="../../layout/utility-tpl-multilingual.xsl"/>
   <xsl:import href="../../layout/utility-fn.xsl"/>
 
-  <xsl:template name="get-iso19115-3.2018-citation">
+  <xsl:template name="get-iso19115-3.2018GNSS-citation">
     <xsl:param name="metadata" as="node()"/>
     <xsl:param name="language" as="xs:string"/>
 
     <xsl:variable name="langId"
-                  select="gn-fn-iso19115-3.2018:getLangId($metadata, $language)"/>
+                  select="gn-fn-iso19115-3.2018GNSS:getLangId($metadata, $language)"/>
 
     <!-- Who is the creator of the data set?  This can be an individual, a group of individuals, or an organization. -->
     <xsl:variable name="authorRoles"
@@ -38,13 +38,13 @@
                         select=".//cit:individual/*/cit:name[1]"/>
 
           <xsl:for-each select="$name">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:for-each>
           <xsl:if test="normalize-space($name) != ''">(</xsl:if>
           <xsl:for-each select="cit:party/*/cit:name">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:for-each>
@@ -59,7 +59,7 @@
 
     <xsl:variable name="translatedTitle">
       <xsl:for-each select="$title">
-        <xsl:call-template name="get-iso19115-3.2018-localised">
+        <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
           <xsl:with-param name="langId" select="$langId"/>
         </xsl:call-template>
       </xsl:for-each>
@@ -99,13 +99,13 @@
                         select=".//cit:individual/*/cit:name[1]"/>
 
           <xsl:for-each select="$name">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:for-each>
           <xsl:if test="normalize-space($name) != ''">(</xsl:if>
           <xsl:for-each select="cit:party/*/cit:name">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:for-each>
@@ -144,7 +144,7 @@
     <xsl:variable name="translatedKeywords">
       <xsl:for-each select="$keywords">
         <keyword>
-          <xsl:call-template name="get-iso19115-3.2018-localised">
+          <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
             <xsl:with-param name="langId" select="$langId"/>
           </xsl:call-template>
         </keyword>
@@ -153,7 +153,7 @@
 
     <xsl:variable name="additionalCitation">
       <xsl:for-each select=".//mrd:onLine/*[cit:protocol/* = 'WWW:LINK-1.0-http--publication-URL']/cit:description">
-        <xsl:call-template name="get-iso19115-3.2018-localised">
+        <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
           <xsl:with-param name="langId" select="$langId"/>
         </xsl:call-template>
       </xsl:for-each>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/common.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/common.xsl
index f19dcab474e..114f6bd07d9 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/common.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/common.xsl
@@ -6,7 +6,7 @@
                 xmlns:util="java:org.fao.geonet.util.XslUtil"
                 xmlns:tr="java:org.fao.geonet.api.records.formatters.SchemaLocalizations"
                 xmlns:gn-fn-render="http://geonetwork-opensource.org/xsl/functions/render"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
                 xmlns:saxon="http://saxon.sf.net/"
                 extension-element-prefixes="saxon"
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/view.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/view.xsl
index 58ea8f7bb40..1df7dcc3035 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/view.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/citation/view.xsl
@@ -8,7 +8,7 @@
                 xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
                 xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:saxon="http://saxon.sf.net/"
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
@@ -25,7 +25,7 @@
 
   <xsl:template match="/">
     <xsl:variable name="citationInfo">
-      <xsl:call-template name="get-iso19115-3.2018-citation">
+      <xsl:call-template name="get-iso19115-3.2018GNSS-citation">
         <xsl:with-param name="metadata" select="$metadata"/>
         <xsl:with-param name="language" select="$language"/>
       </xsl:call-template>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/datacite/view.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/datacite/view.xsl
index cb757e26d1b..33d8420e049 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/datacite/view.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/datacite/view.xsl
@@ -21,7 +21,7 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-<!-- Conversion from iso19115-3.2018 to Datacite
+<!-- Conversion from iso19115-3.2018GNSS to Datacite
 
 
     See http://schema.datacite.org/meta/kernel-4.1/doc/DataCite-MetadataKernel_v4.1.pdf
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/jsonld/view.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/jsonld/view.xsl
index f5d2165df28..5c626ec5794 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/jsonld/view.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/jsonld/view.xsl
@@ -7,7 +7,7 @@
 
   <xsl:output method="text"/>
 
-  <xsl:include href="iso19115-3.2018-to-jsonld.xsl"/>
+  <xsl:include href="iso19115-3.2018GNSS-to-jsonld.xsl"/>
 
   <xsl:template match="/">
     <textResponse>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/xsl-view/view.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/xsl-view/view.xsl
index bfaca7e88a4..8e6be696dae 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/xsl-view/view.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/formatter/xsl-view/view.xsl
@@ -28,7 +28,7 @@
                 xmlns:util="java:org.fao.geonet.util.XslUtil"
                 xmlns:tr="java:org.fao.geonet.api.records.formatters.SchemaLocalizations"
                 xmlns:gn-fn-render="http://geonetwork-opensource.org/xsl/functions/render"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
                 xmlns:saxon="http://saxon.sf.net/"
                 extension-element-prefixes="saxon"
@@ -58,7 +58,7 @@
   <xsl:include href="../../layout/evaluate.xsl"/>
   <xsl:include href="../../layout/utility-tpl-multilingual.xsl"/>
   <xsl:include href="../../layout/utility-fn.xsl"/>
-  <xsl:include href="../jsonld/iso19115-3.2018-to-jsonld.xsl"/>
+  <xsl:include href="../jsonld/iso19115-3.2018GNSS-to-jsonld.xsl"/>
   <xsl:include href="../citation/base.xsl"/>
   <xsl:include href="../citation/common.xsl"/>
 
@@ -70,10 +70,10 @@
   <xsl:variable name="metadata"
                 select="/root/mdb:MD_Metadata"/>
 
-  <xsl:variable name="langId" select="gn-fn-iso19115-3.2018:getLangId($metadata, $language)"/>
+  <xsl:variable name="langId" select="gn-fn-iso19115-3.2018GNSS:getLangId($metadata, $language)"/>
 
   <xsl:variable name="allLanguages">
-    <xsl:call-template name="get-iso19115-3.2018-other-languages"/>
+    <xsl:call-template name="get-iso19115-3.2018GNSS-other-languages"/>
   </xsl:variable>
 
   <xsl:variable name="isOnlyFeatureCatalog"
@@ -92,7 +92,7 @@
     <xsl:for-each select="if ($isOnlyFeatureCatalog)
                           then mdb:contentInfo/*/mrc:featureCatalogue/*/cat:name
                           else mdb:identificationInfo/*/mri:citation/*/cit:title">
-      <xsl:call-template name="get-iso19115-3.2018-localised">
+      <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
         <xsl:with-param name="langId" select="$langId"/>
       </xsl:call-template>
     </xsl:for-each>
@@ -103,7 +103,7 @@
                           then mdb:contentInfo/*/mrc:featureCatalogue/*/cat:scope
                           else mdb:identificationInfo/*/mri:abstract">
       <xsl:variable name="txt">
-        <xsl:call-template name="get-iso19115-3.2018-localised">
+        <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
           <xsl:with-param name="langId" select="$langId"/>
         </xsl:call-template>
       </xsl:variable>
@@ -127,14 +127,14 @@
                                                 text() != '')]">
         <xsl:variable name="thesaurusTitle">
           <xsl:for-each select="mri:thesaurusName/*/cit:title">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:for-each>
         </xsl:variable>
         <xsl:for-each select="mri:keyword">
           <xsl:variable name="keyword">
-            <xsl:call-template name="get-iso19115-3.2018-localised">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:call-template>
           </xsl:variable>
@@ -255,7 +255,7 @@
 
           <xsl:for-each select="mcc:fileDescription">
             <div class="gn-img-thumbnail-caption">
-              <xsl:call-template name="get-iso19115-3.2018-localised">
+              <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
                 <xsl:with-param name="langId" select="$langId"/>
               </xsl:call-template>
             </div>
@@ -272,7 +272,7 @@
                             then mdb:contentInfo/*/mrc:featureCatalogue/*/cat:scope
                             else mdb:identificationInfo/*/mri:abstract">
         <xsl:variable name="txt">
-          <xsl:call-template name="get-iso19115-3.2018-localised">
+          <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
             <xsl:with-param name="langId" select="$langId"/>
           </xsl:call-template>
         </xsl:variable>
@@ -313,7 +313,7 @@
         <xsl:when test="$language = 'all'">
 
           <xsl:variable name="citationInfo">
-            <xsl:call-template name="get-iso19115-3.2018-citation">
+            <xsl:call-template name="get-iso19115-3.2018GNSS-citation">
               <xsl:with-param name="metadata" select="$metadata"/>
               <xsl:with-param name="language" select="$language"/>
             </xsl:call-template>
@@ -348,7 +348,7 @@
         <xsl:when test="count($forcedCitation) > 0">
           <xsl:variable name="txt">
             <xsl:for-each select="$forcedCitation">
-              <xsl:call-template name="get-iso19115-3.2018-localised">
+              <xsl:call-template name="get-iso19115-3.2018GNSS-localised">
                 <xsl:with-param name="langId" select="$langId"/>
               </xsl:call-template>
             </xsl:for-each>
@@ -649,7 +649,7 @@
 
         <div class="row">
           <div class="col-md-6">
-            <!-- Needs improvements as contact/org are more flexible in iso19115-3.2018 -->
+            <!-- Needs improvements as contact/org are more flexible in iso19115-3.2018GNSS -->
             <address>
               <strong>
                 <xsl:choose>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/index-fields/link-utility.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/index-fields/link-utility.xsl
index c6695bce12f..ba4f27292db 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/index-fields/link-utility.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/index-fields/link-utility.xsl
@@ -12,7 +12,7 @@
 
   <!-- Convert an element gco:CharacterString
   to the GN localized string structure -->
-  <xsl:template mode="get-iso19115-3.2018-localized-string" match="*">
+  <xsl:template mode="get-iso19115-3.2018GNSS-localized-string" match="*">
     <xsl:param name="defaultLanguage" select="'eng'" as="xs:string?"/>
 
     <xsl:variable name="mainLanguage"
@@ -42,11 +42,11 @@
           <xsl:value-of select="cit:linkage/gco:CharacterString"/>
         </id>
         <title>
-          <xsl:apply-templates mode="get-iso19115-3.2018-localized-string"
+          <xsl:apply-templates mode="get-iso19115-3.2018GNSS-localized-string"
                                select="cit:name"/>
         </title>
         <url>
-          <xsl:apply-templates mode="get-iso19115-3.2018-localized-string"
+          <xsl:apply-templates mode="get-iso19115-3.2018GNSS-localized-string"
                                select="cit:linkage"/>
         </url>
         <function>
@@ -56,7 +56,7 @@
           <xsl:value-of select="cit:applicationProfile/gco:CharacterString"/>
         </applicationProfile>
         <description>
-          <xsl:apply-templates mode="get-iso19115-3.2018-localized-string"
+          <xsl:apply-templates mode="get-iso19115-3.2018GNSS-localized-string"
                                select="cit:description"/>
         </description>
         <protocol>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/config-editor.xml b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/config-editor.xml
index 6839db0d933..e5d20bb195d 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/config-editor.xml
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/config-editor.xml
@@ -150,7 +150,7 @@
       use the following configuration:
               data-filter='{"root": "gmd:CI_ResponsibleParty"}'
               data-variables="gmd:role/gmd:CI_RoleCode/@codeListValue~{role}"
-              data-transformation="contact-from-iso19139-to-iso19115-3.2018"/>
+              data-transformation="contact-from-iso19139-to-iso19115-3.2018GNSS"/>
        -->
       <directiveAttributes
         data-template-add-snippet="&lt;cit:CI_Responsibility
@@ -403,7 +403,7 @@
 
     <for name="mri:descriptiveKeywords" addDirective="data-gn-thesaurus-selector">
       <directiveAttributes
-              data-transformation="to-iso19115-3.2018-keyword-with-anchor"
+              data-transformation="to-iso19115-3.2018GNSS-keyword-with-anchor"
               data-include="xpath::string-join(*
                                           //mri:thesaurusName//cit:identifier/*/
                                             mcc:code/gcx:Anchor/
@@ -801,10 +801,10 @@
         <for name="gfc:listedValue"/>
       </flatModeExceptions>
       <thesaurusList>
-        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeufeatureconcept-featureconcept" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeufeatureconcept-featureconcept" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
       </thesaurusList>
     </view>
 
@@ -1055,10 +1055,10 @@
         <for name="srv:operationDescription" />
       </flatModeExceptions>
       <thesaurusList>
-        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeufeatureconcept-featureconcept" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeufeatureconcept-featureconcept" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
       </thesaurusList>
 
     </view>
@@ -1101,7 +1101,7 @@
         <section>
           <xsl xpath="/mdb:MD_Metadata/mdb:dataQualityInfo"
                or="report"
-               mode="iso19115-3.2018-qm"/>
+               mode="iso19115-3.2018GNSS-qm"/>
         </section>
       </tab>-->
       <tab id="resourceLineage">
@@ -1160,9 +1160,9 @@
                  in="/mdb:MD_Metadata"/>
       </tab>
       <thesaurusList>
-        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
-        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeutheme-theme" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistSpatialScope-SpatialScope" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
+        <thesaurus key="external.theme.httpinspireeceuropaeumetadatacodelistPriorityDataset-PriorityDataset" transformations="to-iso19115-3.2018GNSS-keyword-with-anchor"/>
       </thesaurusList>
     </view>
     <view name="xml">
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/dispatcher.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/dispatcher.xsl
index 8958e9fcfdc..18e540e3739 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/dispatcher.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/dispatcher.xsl
@@ -29,19 +29,19 @@
     Load the schema configuration for the editor.
     Same configuration as ISO19139 here.
       -->
-  <xsl:template name="get-iso19115-3.2018-configuration">
+  <xsl:template name="get-iso19115-3.2018GNSS-configuration">
     <xsl:copy-of select="document('config-editor.xml')"/>
   </xsl:template>
 
 
   <!-- Dispatch to the current profile mode -->
-  <xsl:template name="dispatch-iso19115-3.2018">
+  <xsl:template name="dispatch-iso19115-3.2018GNSS">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="overrideLabel" as="xs:string?" required="no" select="''"/>
     <xsl:param name="refToDelete" as="node()?" required="no"/>
     <xsl:param name="config" as="node()?" required="no"/>
 
-    <xsl:apply-templates mode="mode-iso19115-3.2018" select="$base">
+    <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="$base">
       <xsl:with-param name="overrideLabel" select="$overrideLabel"/>
       <xsl:with-param name="refToDelete" select="$refToDelete"/>
       <xsl:with-param name="config" select="$config"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/evaluate.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/evaluate.xsl
index 97ce0b28d43..1e0b02b6266 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/evaluate.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/evaluate.xsl
@@ -33,7 +33,7 @@
 
 
   <!-- The following templates usually delegates all to iso19139. -->
-  <xsl:template name="evaluate-iso19115-3.2018">
+  <xsl:template name="evaluate-iso19115-3.2018GNSSGNSS">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
     <!-- <xsl:message>in xml <xsl:copy-of select="$base"></xsl:copy-of></xsl:message>
@@ -57,7 +57,7 @@
   </xsl:template>
 
   <!-- Evaluate XPath returning a boolean value. -->
-  <xsl:template name="evaluate-iso19115-3.2018-boolean">
+  <xsl:template name="evaluate-iso19115-3.2018GNSS-boolean">
     <xsl:param name="base" as="node()"/>
     <xsl:param name="in"/>
 
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-contact.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-contact.xsl
index 002664ae23b..164a00c3526 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-contact.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-contact.xsl
@@ -32,21 +32,21 @@
   ```
 
   -->
-  <xsl:template mode="mode-iso19115-3.2018" match="*[cit:CI_Telephone]" priority="2000">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="*[cit:CI_Telephone]" priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
 
-    <xsl:apply-templates mode="mode-iso19115-3.2018" select="*/cit:*">
+    <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*/cit:*">
       <xsl:with-param name="schema" select="$schema"/>
       <xsl:with-param name="labels" select="$labels"/>
     </xsl:apply-templates>
   </xsl:template>
 
   <!-- Number type is handled in next template -->
-  <xsl:template mode="mode-iso19115-3.2018" match="cit:numberType" priority="2000"/>
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="cit:numberType" priority="2000"/>
 
   <!-- Rendering number type as a dropdown -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 priority="2000"
                 match="cit:number[parent::node()/name() = 'cit:CI_Telephone']">
     <xsl:param name="schema" select="$schema" required="no"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-date.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-date.xsl
index fe766297a92..93c627c3674 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-date.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-date.xsl
@@ -43,23 +43,23 @@
   Swallow the complex element having CI_Date
   to simplify the editor for dates
   -->
-  <xsl:template mode="mode-iso19115-3.2018" match="*[cit:CI_Date]" priority="2000">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="*[cit:CI_Date]" priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
 
-    <xsl:apply-templates mode="mode-iso19115-3.2018" select="*/cit:*">
+    <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*/cit:*">
       <xsl:with-param name="schema" select="$schema"/>
       <xsl:with-param name="labels" select="$labels"/>
     </xsl:apply-templates>
   </xsl:template>
 
   <!-- Date type is handled in next template -->
-  <xsl:template mode="mode-iso19115-3.2018" match="cit:dateType" priority="2000"/>
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="cit:dateType" priority="2000"/>
 
   <!-- Rendering date type as a dropdown to select type
   and the calendar next to it.
   -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 priority="2000"
                 match="cit:CI_Date/cit:date[../cit:dateType]">
     <xsl:param name="schema" select="$schema" required="no"/>
@@ -134,7 +134,7 @@
   Date with not date type.
    eg. cit:editionDate
   -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 priority="2000"
                 match="*[(gco:Date|gco:DateTime) and not(../cit:dateType)]">
     <xsl:param name="schema" select="$schema" required="no"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-keywords.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-keywords.xsl
index 739222a33a5..0e2b040df5d 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-keywords.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields-keywords.xsl
@@ -24,7 +24,7 @@
     the advanced editor which provides easy selection of
     keywords.
   -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="2000" match="
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="2000" match="
     mri:descriptiveKeywords">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
@@ -100,7 +100,7 @@
 
     <xsl:choose>
       <xsl:when test="($isFlatMode and not($thesaurusConfig/@fieldset)) or $thesaurusConfig/@fieldset = 'false'">
-        <xsl:apply-templates mode="mode-iso19115-3.2018" select="*">
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*">
           <xsl:with-param name="schema" select="$schema"/>
           <xsl:with-param name="labels" select="$labels"/>
           <xsl:with-param name="overrideLabel" select="$overrideLabel"/>
@@ -117,7 +117,7 @@
           <xsl:with-param name="xpath" select="$xpath"/>
           <xsl:with-param name="attributesSnippet" select="$attributes"/>
           <xsl:with-param name="subTreeSnippet">
-            <xsl:apply-templates mode="mode-iso19115-3.2018" select="*">
+            <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*">
               <xsl:with-param name="schema" select="$schema"/>
               <xsl:with-param name="labels" select="$labels"/>
               <xsl:with-param name="overrideLabel" select="$overrideLabel"/>
@@ -130,7 +130,7 @@
   </xsl:template>
 
 
-  <xsl:template mode="mode-iso19115-3.2018" match="mri:MD_Keywords" priority="2000">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="mri:MD_Keywords" priority="2000">
     <xsl:param name="overrideLabel" select="''" required="no"/>
 
     <xsl:variable name="thesaurusIdentifier"
@@ -188,15 +188,15 @@
                       as="xs:string"
                       select="if ($thesaurusConfig/@transformations != '')
                               then $thesaurusConfig/@transformations
-                              else 'to-iso19115-3.2018-keyword,to-iso19115-3.2018-keyword-with-anchor,to-iso19115-3.2018-keyword-as-xlink'"/>
+                              else 'to-iso19115-3.2018GNSS-keyword,to-iso19115-3.2018-keyword-with-anchor,to-iso19115-3.2018-keyword-as-xlink'"/>
 
         <!-- Get current transformation mode based on XML fragement analysis -->
         <xsl:variable name="transformation"
           select="if (parent::node()/@xlink:href)
-                  then 'to-iso19115-3.2018-keyword-as-xlink'
+                  then 'to-iso19115-3.2018GNSS-keyword-as-xlink'
                   else if (count(mri:keyword/gcx:Anchor) > 0)
-                  then 'to-iso19115-3.2018-keyword-with-anchor'
-                  else 'to-iso19115-3.2018-keyword'"/>
+                  then 'to-iso19115-3.2018GNSS-keyword-with-anchor'
+                  else 'to-iso19115-3.2018GNSS-keyword'"/>
 
         <xsl:variable name="parentName" select="name(..)"/>
 
@@ -265,7 +265,7 @@
         </xsl:if>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:apply-templates mode="mode-iso19115-3.2018" select="*"/>
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*"/>
       </xsl:otherwise>
     </xsl:choose>
 
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields.xsl
index f4eae6b607d..ab6e0ece83e 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout-custom-fields.xsl
@@ -19,7 +19,7 @@
 
 
   <!-- Readonly elements -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="modeso19115-i-3.2018GNSS"
                 match="mdb:metadataIdentifier/mcc:MD_Identifier/mcc:code|
                        mdb:dateInfo/cit:CI_Date[cit:dateType/cit:CI_DateTypeCode = 'revision']/cit:date|
                        mdb:dateInfo/cit:CI_Date[cit:dateType/cit:CI_DateTypeCode = 'revision']/cit:dateType"
@@ -68,7 +68,7 @@
 
 
   <!-- Set CRS system type before the CRS -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 priority="2000"
                 match="mrs:MD_ReferenceSystem">
     <xsl:param name="schema" select="$schema" required="no"/>
@@ -105,23 +105,23 @@
       <xsl:with-param name="attributesSnippet" select="$attributes"/>
       <xsl:with-param name="subTreeSnippet">
 
-        <xsl:apply-templates mode="mode-iso19115-3.2018"
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS"
                              select="mrs:referenceSystemType"/>
 
-        <xsl:apply-templates mode="mode-iso19115-3.2018"
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS"
                              select="gn:*[@name = 'referenceSystemType']"/>
 
-        <xsl:apply-templates mode="mode-iso19115-3.2018"
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS"
                              select="mrs:referenceSystemIdentifier"/>
 
-        <xsl:apply-templates mode="mode-iso19115-3.2018"
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS"
                              select="gn:*[@name = 'referenceSystemIdentifier']"/>
       </xsl:with-param>
     </xsl:call-template>
   </xsl:template>
 
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="@uuidref" priority="2000">
     <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
 
@@ -141,7 +141,7 @@
 
 
   <!-- Measure elements, gco:Distance, gco:Angle, gco:Scale, gco:Length, ... -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="2000" match="mri:*[gco:*/@uom]">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="2000" match="mri:*[gco:*/@uom]">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
     <xsl:param name="refToDelete" select="''" required="no"/>
@@ -192,7 +192,7 @@
     </div>
   </xsl:template>
 
- <!-- <xsl:template mode="mode-iso19115-3.2018"
+ <!-- <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="cit:CI_Date"
                 priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
@@ -200,13 +200,13 @@
 
     <div class="row">
       <div class="col-md-8">
-        <xsl:apply-templates mode="mode-iso19115-3.2018" select="cit:date">
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="cit:date">
           <xsl:with-param name="schema" select="$schema"/>
           <xsl:with-param name="labels" select="$labels"/>
         </xsl:apply-templates>
       </div>
       <div class="col-md-4">
-        <xsl:apply-templates mode="mode-iso19115-3.2018" select="cit:dateType">
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="cit:dateType">
           <xsl:with-param name="schema" select="$schema"/>
           <xsl:with-param name="labels" select="$labels"/>
         </xsl:apply-templates>
@@ -220,7 +220,7 @@
   <!-- gml:TimePeriod (format = %Y-%m-%dThh:mm:ss) -->
   <!-- ===================================================================== -->
 
-  <xsl:template mode="mode-iso19115-3.2018" match="gml:beginPosition|gml:endPosition|gml:timePosition"
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="gml:beginPosition|gml:endPosition|gml:timePosition"
                 priority="200">
 
 
@@ -266,7 +266,7 @@
     </xsl:call-template>
   </xsl:template>
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="gex:EX_GeographicBoundingBox"
                 priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
@@ -292,7 +292,7 @@
     </xsl:call-template>
   </xsl:template>
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="gex:EX_BoundingPolygon" priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
@@ -330,10 +330,10 @@
   </xsl:template>
 
   <!-- Those elements MUST be ignored in the editor layout -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="*[contains(name(), 'GROUP_ELEMENT')]"
                 priority="2000">
-    <xsl:apply-templates mode="mode-iso19115-3.2018" select="*"/>
+    <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*"/>
   </xsl:template>
 
 
@@ -341,17 +341,17 @@
     Display contact as table when mode is flat (eg. simple view) or if using xsl mode
     Match first node (or added one)
   -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="*[
                         *[1]/name() = $editorConfig/editor/tableFields/table/@for and
                         (1 or @gn:addedObj = 'true') and
                         $isFlatMode]"
                 priority="2000">
-    <xsl:call-template name="iso19115-3.2018-table"/>
+    <xsl:call-template name="iso19115-3.2018GNSS-table"/>
   </xsl:template>
 
   <!-- Ignore the following -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="*[
                         *[1]/name() = $editorConfig/editor/tableFields/table/@for and
                         preceding-sibling::*[1]/name() = name() and
@@ -360,7 +360,7 @@
                 priority="2000"/>
 
   <!-- Define table layout -->
-  <xsl:template name="iso19115-3.2018-table">
+  <xsl:template name="iso19115-3.2018GNSS-table">
     <xsl:variable name="name" select="name()"/>
     <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
     <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout.xsl
index 6fedcd7ccf7..1dd6d304538 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/layout.xsl
@@ -26,7 +26,7 @@
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core"
   xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   exclude-result-prefixes="#all">
 
   <xsl:include href="utility-fn.xsl"/>
@@ -37,7 +37,7 @@
   <xsl:include href="layout-custom-fields-keywords.xsl"/>
 
   <!-- Visit all XML tree recursively -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="mds:*|mcc:*|mri:*|mrs:*|mrc:*|mrd:*|mco:*|msr:*|lan:*|
                        gcx:*|gex:*|dqm:*|mdq:*|cit:*|srv:*|gml:*|gts:*|gfc:*"
                 priority="2">
@@ -45,7 +45,7 @@
     <xsl:param name="labels" select="$labels" required="no"/>
     <xsl:param name="refToDelete" required="no"/>
 
-    <xsl:apply-templates mode="mode-iso19115-3.2018" select="*|@*">
+    <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*|@*">
       <xsl:with-param name="schema" select="$schema"/>
       <xsl:with-param name="labels" select="$labels"/>
       <xsl:with-param name="refToDelete" select="$refToDelete"/>
@@ -53,13 +53,13 @@
   </xsl:template>
 
   <!-- Ignore all gn element -->
-  <xsl:template mode="mode-iso19115-3.2018" match="gn:*|@gn:*|@*" priority="1000"/>
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="gn:*|@gn:*|@*" priority="1000"/>
 
 
   <!-- Template to display non existing element ie. geonet:child element
 	of the metadocument. Display in editing mode only and if
   the editor mode is not flat mode. -->
-  <xsl:template mode="mode-iso19115-3.2018" match="gn:child" priority="2000">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="gn:child" priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
 
@@ -139,7 +139,7 @@
       * and gmd:*: Match all elements having gmd child elements
       * and not(gco:CharacterString): Don't take into account those having gco:CharacterString (eg. multilingual elements)
   -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="200"
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="200"
                 match="*[name() = $editorConfig/editor/fieldsWithFieldset/name
                           or @gco:isoType = $editorConfig/editor/fieldsWithFieldset/name]|
                         *[namespace-uri(.) != $gnUri and $isFlatMode = false() and
@@ -184,7 +184,7 @@
         <!-- Process child of those element. Propagate schema
         and labels to all subchilds (eg. needed like iso19110 elements
         contains gmd:* child. -->
-        <xsl:apply-templates mode="mode-iso19115-3.2018" select="*">
+        <xsl:apply-templates mode="mode-iso19115-3.2018GNSS" select="*">
           <xsl:with-param name="schema" select="$schema"/>
           <xsl:with-param name="labels" select="$labels"/>
         </xsl:apply-templates>
@@ -199,7 +199,7 @@
   </xsl:template>
 
   <!-- Render simple element which usually match a form field -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="200"
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="200"
                 match="*[gco:CharacterString|gcx:Anchor|gco:Integer|gco:UnlimitedInteger|gco:Decimal|
        gco:Boolean|gco:Real|gco:Measure|gco:Length|gco:Distance|gco:Angle|gmx:FileName|
        gco:Scale|gco:RecordType|gcx:MimeFileType|gco:LocalName|gco:ScopedName|gco:RecordType|
@@ -248,7 +248,7 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:variable name="excluded"
-                  select="gn-fn-iso19115-3.2018:isNotMultilingualField(., $editorConfig)"/>
+                  select="gn-fn-iso19115-3.2018GNSS:isNotMultilingualField(., $editorConfig)"/>
 
 
     <xsl:variable name="hasPTFreeText" select="count(lan:PT_FreeText) > 0"/>
@@ -418,7 +418,7 @@
 
 
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="gml:beginPosition|gml:endPosition|gml:timePosition"
                 priority="400">
     <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
@@ -450,7 +450,7 @@
   </xsl:template>
 
 
-  <xsl:template mode="mode-iso19115-3.2018" priority="200"
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="200"
                 match="gfc:memberName|gfc:typeName|gfc:aliases">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
@@ -486,10 +486,10 @@
   </xsl:template>
 
   <!--
-  <xsl:template mode="mode-iso19115-3.2018" match="*|@*" priority="0"/>
+  <xsl:template mode="mode-iso19115-3.2018GNSS" match="*|@*" priority="0"/>
 -->
   <!-- Codelists -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="200"
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="200"
                 match="*[*/@codeList]">
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
@@ -519,7 +519,7 @@
       <xsl:with-param name="value" select="*/@codeListValue"/>
       <xsl:with-param name="cls" select="local-name()"/>
       <xsl:with-param name="xpath" select="$xpath"/>
-      <xsl:with-param name="type" select="gn-fn-iso19115-3.2018:getCodeListType(name(), $editorConfig)"/>
+      <xsl:with-param name="type" select="gn-fn-iso19115-3.2018GNSS:getCodeListType(name(), $editorConfig)"/>
       <xsl:with-param name="name"
                       select="concat(*/gn:element/@ref, '_codeListValue')"/>
       <xsl:with-param name="editInfo" select="*/gn:element"/>
@@ -543,7 +543,7 @@
       <geonet:text value="boundaries"/
   -->
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="mri:topicCategory[1]"
                 priority="2100">
 
@@ -574,15 +574,15 @@
   </xsl:template>
 
   <!-- Ignore the following topic categories and the gn:child to add new ones -->
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="mri:topicCategory[preceding-sibling::*[1]/name() = name()]"
                 priority="2100"/>
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="gn:child[@name = 'topicCategory' and count(../mri:topicCategory) > 0]"
                 priority="21000"/>
 
 
-  <xsl:template mode="mode-iso19115-3.2018"
+  <xsl:template mode="mode-iso19115-3.2018GNSS"
                 match="*[gn:element/gn:text]"
                 priority="2000">
     <xsl:param name="schema" select="$schema" required="no"/>
@@ -595,7 +595,7 @@
                       select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), '', '')"/>
       <xsl:with-param name="value" select="text()"/>
       <xsl:with-param name="cls" select="local-name()"/>
-      <xsl:with-param name="type" select="gn-fn-iso19115-3.2018:getCodeListType(name(), $editorConfig)"/>
+      <xsl:with-param name="type" select="gn-fn-iso19115-3.2018GNSS:getCodeListType(name(), $editorConfig)"/>
       <xsl:with-param name="name" select="gn:element/@ref"/>
       <xsl:with-param name="editInfo" select="if ($refToDelete) then $refToDelete else */gn:element"/>
       <xsl:with-param name="listOfValues"
@@ -606,10 +606,10 @@
 
   <!-- Some element to ignore which are matched by the
   next template -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="400" match="gml:TimeInstantType"/>
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="400" match="gml:TimeInstantType"/>
 
   <!-- the gml element having no child eg. gml:name. -->
-  <xsl:template mode="mode-iso19115-3.2018" priority="300" match="gml:*[count(.//gn:element) = 1]">
+  <xsl:template mode="mode-iso19115-3.2018GNSS" priority="300" match="gml:*[count(.//gn:element) = 1]">
     <xsl:variable name="name" select="name(.)"/>
 
     <xsl:variable name="labelConfig" select="gn-fn-metadata:getLabel($schema, $name, $labels)"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-brief.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-brief.xsl
index f571354d970..071ef2b24e4 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-brief.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-brief.xsl
@@ -1,41 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1"
-  xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/2.0"
-  xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-  xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
-  xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-  xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-  xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-  xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0"
-  xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
-  xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
-  xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
-  xmlns:dqm="http://standards.iso.org/iso/19157/-2/dqm/1.0"
-  xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
-  xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
-  xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-  xmlns:gn="http://www.fao.org/geonetwork"
-  xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core"
-  xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="#all" version="2.0">
+                xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1"
+                xmlns:mds="http://standards.iso.org/iso/19115/-3/mds/2.0"
+                xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
+                xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
+                xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
+                xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
+                xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
+                xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0"
+                xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
+                xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
+                xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0"
+                xmlns:dqm="http://standards.iso.org/iso/19157/-2/dqm/1.0"
+                xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
+                xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
+                xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
+                xmlns:gn="http://www.fao.org/geonetwork"
+                xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core"
+                xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="#all" version="2.0">
 
   <xsl:include href="utility-fn.xsl"/>
   <xsl:include href="utility-tpl.xsl"/>
 
-  <xsl:template mode="superBriefGNSS" match="mdb:MD_Metadata|*[@gco:isoType='mdb:MD_Metadata']"
+  <xsl:template mode="superBrief" match="mdb:MD_Metadata|*[@gco:isoType='mdb:MD_Metadata']"
                 priority="2">
-    <metadata>
-      <xsl:call-template name="superBrief"/>
-    </metadata>
+    <xsl:variable name="langId" select="gn-fn-iso19139:getLangId(., $lang)"/>
+
+    <id>
+      <xsl:value-of select="gn:info/id"/>
+    </id>
+    <uuid>
+      <xsl:value-of select="gn:info/uuid"/>
+    </uuid>
+    <title>
+      <xsl:apply-templates mode="localised"
+                           select="mdb:identificationInfo/*/mri:citation/*/cit:title">
+        <xsl:with-param name="langId" select="$langId"/>
+      </xsl:apply-templates>
+    </title>
+    <abstract>
+      <xsl:apply-templates mode="localised" select="mdb:identificationInfo/*/mri:abstract">
+        <xsl:with-param name="langId" select="$langId"/>
+      </xsl:apply-templates>
+    </abstract>
   </xsl:template>
 
 
   <!-- Templates used for RSS -->
-
-  <xsl:template name="iso19115-3.2018GNSS-brief">
+  <xsl:template name="iso19115-3.2018GNSSBrief">
     <metadata>
-      <xsl:call-template name="iso19115-3.2018-brief"/>
+      <xsl:call-template name="iso19115-3.2018GNSS-brief"/>
     </metadata>
   </xsl:template>
+
+  <xsl:template name="iso19115-3.2018GNSS-brief">
+    <xsl:variable name="info" select="gn:info"/>
+    <xsl:variable name="id" select="$info/id"/>
+    <xsl:variable name="uuid" select="$info/uuid"/>
+
+    <xsl:variable name="langId" select="gn-fn-iso19139:getLangId(., $lang)"/>
+
+    <title>
+      <xsl:apply-templates mode="localised"
+                           select="mdb:identificationInfo/*/mri:citation/*/cit:title">
+        <xsl:with-param name="langId" select="$langId"/>
+      </xsl:apply-templates>
+    </title>
+    <abstract>
+      <xsl:apply-templates mode="localised" select="mdb:identificationInfo/*/mri:abstract">
+        <xsl:with-param name="langId" select="$langId"/>
+      </xsl:apply-templates>
+    </abstract>
+
+
+    <xsl:variable name="overviews"
+                  select="mdb:identificationInfo/*/mri:graphicOverview/mcc:MD_BrowseGraphic/
+                                mcc:fileName/gco:CharacterString[. != '']"/>
+    <xsl:for-each select="$overviews">
+      <image>
+        <xsl:value-of select="."/>
+      </image>
+    </xsl:for-each>
+
+    <metadatacreationdate>
+      <xsl:value-of select="mdb:dateInfo/*[cit:dateType/*/@codeListValue = 'revision']/cit:date/gco:DateTime"/>
+    </metadatacreationdate>
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-csv.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-csv.xsl
index 74df52a8a51..2ebb5c250af 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-csv.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/tpl-csv.xsl
@@ -18,7 +18,7 @@
                 xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 exclude-result-prefixes="#all" version="2.0">
 
@@ -28,7 +28,7 @@
   <xsl:template mode="csv" match="mdb:MD_Metadata|*[@gco:isoType='mdb:MD_Metadata']"
                 priority="2">
     <metadata>
-      <xsl:variable name="langId" select="gn-fn-iso19115-3.2018:getLangId(., $lang)"/>
+      <xsl:variable name="langId" select="gn-fn-iso19115-3.2018GNSS:getLangId(., $lang)"/>
       <id>
         <xsl:value-of select="gn:info/id"/>
       </id>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-fn.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-fn.xsl
index ca10e621241..37a9963ece0 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-fn.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-fn.xsl
@@ -5,12 +5,12 @@
   xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
   xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
   xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata"
   exclude-result-prefixes="#all">
 
 
-  <xsl:function name="gn-fn-iso19115-3.2018:write-date-or-dateTime" as="node()">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:write-date-or-dateTime" as="node()">
     <xsl:param name="date" as="xs:string"/>
     <xsl:param name="dateType" as="xs:string"/>
     <cit:CI_Date>
@@ -37,7 +37,7 @@
   parameter. If not found, return the lang parameter
   prefixed by #.
         -->
-  <xsl:function name="gn-fn-iso19115-3.2018:getLangId" as="xs:string">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:getLangId" as="xs:string">
     <xsl:param name="md"/>
     <xsl:param name="lang"/>
 
@@ -57,7 +57,7 @@
   </xsl:function>
 
 
-  <xsl:function name="gn-fn-iso19115-3.2018:getCodeListType" as="xs:string">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:getCodeListType" as="xs:string">
     <xsl:param name="name" as="xs:string"/>
     <xsl:param name="editorConfig" as="node()"/>
 
@@ -68,7 +68,7 @@
   </xsl:function>
 
 
-  <xsl:function name="gn-fn-iso19115-3.2018:isNotMultilingualField" as="xs:boolean">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:isNotMultilingualField" as="xs:boolean">
     <xsl:param name="element" as="node()"/>
     <xsl:param name="editorConfig" as="node()"/>
 
@@ -136,15 +136,15 @@
     split on 2 chars to get language code and get string from the 4 position
     to get the value.
    -->
-  <xsl:function name="gn-fn-iso19115-3.2018:fillTextElement" as="node()*">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:fillTextElement" as="node()*">
     <xsl:param name="string" as="xs:string"/>
     <xsl:param name="mainLanguage" as="xs:string?"/>
     <xsl:param name="useOnlyPTFreeText" as="xs:boolean"/>
 
-    <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($string, '\|', '#', $mainLanguage, $useOnlyPTFreeText)"/>
+    <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($string, '\|', '#', $mainLanguage, $useOnlyPTFreeText)"/>
   </xsl:function>
 
-  <xsl:function name="gn-fn-iso19115-3.2018:fillTextElement" as="node()*">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:fillTextElement" as="node()*">
     <xsl:param name="string" as="xs:string"/>
     <xsl:param name="translationSeparator" as="xs:string"/>
     <xsl:param name="valueSeparator" as="xs:string"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl-multilingual.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl-multilingual.xsl
index 04a62f580c8..b35aaad6ab2 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl-multilingual.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl-multilingual.xsl
@@ -9,13 +9,13 @@
   exclude-result-prefixes="#all">
 
   <!-- Get the main metadata languages -->
-  <xsl:template name="get-iso19115-3.2018-language">
+  <xsl:template name="get-iso19115-3.2018GNSS-language">
     <xsl:value-of select="$metadata/mdb:defaultLocale/
     lan:PT_Locale/lan:language/lan:LanguageCode/@codeListValue"/>
   </xsl:template>
 
   <!-- Get the list of other languages in JSON -->
-  <xsl:template name="get-iso19115-3.2018-other-languages-as-json">
+  <xsl:template name="get-iso19115-3.2018GNSS-other-languages-as-json">
     <xsl:variable name="langs">
       <xsl:choose>
         <xsl:when test="$metadata/gn:info[position() = last()]/isTemplate = 's'">
@@ -28,7 +28,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:variable name="mainLanguage">
-            <xsl:call-template name="get-iso19115-3.2018-language"/>
+            <xsl:call-template name="get-iso19115-3.2018GNSS-language"/>
           </xsl:variable>
           <xsl:if test="$mainLanguage">
             <xsl:variable name="mainLanguageId"
@@ -49,9 +49,9 @@
   </xsl:template>
 
   <!-- Get the list of other languages -->
-  <xsl:template name="get-iso19115-3.2018-other-languages">
+  <xsl:template name="get-iso19115-3.2018GNSS-other-languages">
     <xsl:variable name="mainLanguage">
-      <xsl:call-template name="get-iso19115-3.2018-language"/>
+      <xsl:call-template name="get-iso19115-3.2018GNSS-language"/>
     </xsl:variable>
 
     <xsl:choose>
@@ -80,7 +80,7 @@
        are reported with an xml:lang attribute indicating
        the language of the text.
     -->
-  <xsl:template name="get-iso19115-3.2018-localised"
+  <xsl:template name="get-iso19115-3.2018GNSS-localised"
                 mode="localised"
                 match="*[lan:PT_FreeText or gco:CharacterString or gcx:Anchor]">
     <xsl:param name="langId"/>
@@ -121,11 +121,11 @@
 
 
   <!-- Map GUI language to iso3code -->
-  <xsl:template name="getLangId19115-3.2018">
+  <xsl:template name="getLangId19115-3.2018GNSS">
     <xsl:param name="langGui"/>
     <xsl:param name="md"/>
 
-    <xsl:call-template name="getLangIdFromMetadata19115-3.2018">
+    <xsl:call-template name="getLangIdFromMetadata19115-3.2018GNSS">
       <xsl:with-param name="lang" select="$langGui"/>
       <xsl:with-param name="md" select="$md"/>
     </xsl:call-template>
@@ -136,7 +136,7 @@
 
        if not return the lang iso3code in uper case.
       -->
-  <xsl:template name="getLangIdFromMetadata19115-3.2018">
+  <xsl:template name="getLangIdFromMetadata19115-3.2018GNSS">
     <xsl:param name="md"/>
     <xsl:param name="lang"/>
 
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl.xsl
index 59a5bfde479..65b071b7ab5 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-tpl.xsl
@@ -25,12 +25,12 @@
   <xsl:import href="common/index-utils.xsl"/>
   <xsl:include href="utility-tpl-multilingual.xsl"/>
 
-  <xsl:template name="get-iso19115-3.2018-is-service">
+  <xsl:template name="get-iso19115-3.2018GNSS-is-service">
     <xsl:value-of
             select="count($metadata/mdb:identificationInfo/srv:SV_ServiceIdentification) > 0"/>
   </xsl:template>
 
-  <xsl:template name="get-iso19115-3.2018-title">
+  <xsl:template name="get-iso19115-3.2018GNSS-title">
     <xsl:value-of select="($metadata/mdb:identificationInfo/*/mri:citation/*/cit:title/gco:CharacterString
                           |$metadata/mdb:contentInfo/*/mrc:featureCatalogue/*/cat:name[*/text() != '']
                           |$metadata/mdb:contentInfo/*/mrc:featureCatalogue/*/gfc:featureType/*/gfc:typeName[text() != ''])[1]
@@ -48,7 +48,7 @@
   </xsl:template>
 
 
-  <xsl:template name="get-iso19115-3.2018-extents-as-json">[
+  <xsl:template name="get-iso19115-3.2018GNSS-extents-as-json">[
    <xsl:for-each select="//mdb:identificationInfo/*/mri:extent
                           //gex:geographicElement/gex:EX_GeographicBoundingBox[
             number(gex:westBoundLongitude/gco:Decimal)
@@ -73,7 +73,7 @@
     ]
   </xsl:template>
 
-  <xsl:template name="get-iso19115-3.2018-online-source-config">
+  <xsl:template name="get-iso19115-3.2018GNSS-online-source-config">
     <xsl:param name="pattern"/>
     <config>
       <xsl:for-each select="$metadata/descendant::mrd:onLine[
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-vacuum.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-vacuum.xsl
index 6d7b847fd84..9fda04a3cae 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-vacuum.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/layout/utility-vacuum.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:gn="http://www.fao.org/geonetwork"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 exclude-result-prefixes="#all">
 
   <!-- Vacuum utility. Remove empty elements from a metadata record:
@@ -10,18 +10,18 @@
   * All elements having no child text (ie. normalize-space return '') and
   have only empty attribute (or gco:nilReason=missing).
 
-  The main function call the vacuum-iso19115-3.2018 mode.
+  The main function call the vacuum-iso19115-3.2018GNSS mode.
   -->
-  <xsl:function name="gn-fn-iso19115-3.2018:vacuum" as="node()">
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:vacuum" as="node()">
     <xsl:param name="metadata" as="node()"/>
     <xsl:for-each select="$metadata/*">
-      <xsl:apply-templates mode="vacuum-iso19115-3.2018"
+      <xsl:apply-templates mode="vacuum-iso19115-3.2018GNSS"
                            select="."/>
     </xsl:for-each>
   </xsl:function>
 
 
-  <xsl:function name="gn-fn-iso19115-3.2018:isElementOrChildEmpty"
+  <xsl:function name="gn-fn-iso19115-3.2018GNSS:isElementOrChildEmpty"
                 as="xs:boolean">
     <xsl:param name="element"/>
 
@@ -42,10 +42,10 @@
   </xsl:function>
 
   <!-- Do a copy of every nodes and attributes -->
-  <xsl:template mode="vacuum-iso19115-3.2018"
+  <xsl:template mode="vacuum-iso19115-3.2018GNSS"
                 match="@*|node()">
     <xsl:variable name="isElementEmpty"
-                  select="gn-fn-iso19115-3.2018:isElementOrChildEmpty(.)"/>
+                  select="gn-fn-iso19115-3.2018GNSS:isElementOrChildEmpty(.)"/>
 
     <xsl:choose>
       <xsl:when test="$isElementEmpty = true()">
@@ -55,7 +55,7 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:copy>
-          <xsl:apply-templates mode="vacuum-iso19115-3.2018"
+          <xsl:apply-templates mode="vacuum-iso19115-3.2018GNSS"
                                select="@*|node()"/>
         </xsl:copy>
       </xsl:otherwise>
@@ -65,14 +65,14 @@
   <!--
   This will not work as it will only remove elements and its parent.
   It will not handle complex empty element.
-  <xsl:template mode="vacuum-iso19115-3.2018"
+  <xsl:template mode="vacuum-iso19115-3.2018GNSS"
                 match="@*[. = '']|
                        *[gco:CharacterString/normalize-space(text()) = '']|
                        *[text() = '' and count(@*) = 0 and count(*) = 0]"
                 priority="2"><empty/></xsl:template>-->
 
   <!-- Always remove gn:* elements. -->
-  <xsl:template mode="vacuum-iso19115-3.2018"
+  <xsl:template mode="vacuum-iso19115-3.2018GNSS"
                 match="gn:*" priority="2"/>
 
 </xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/loc/eng/strings.xml b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/loc/eng/strings.xml
index be63868fc76..59f36287fbc 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/loc/eng/strings.xml
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/loc/eng/strings.xml
@@ -41,8 +41,8 @@
   <metadata>Metadata</metadata>
 
 !-- Added ICMS element names BC 20-07-23 -->
-  <icsm>ICSM</icsm>  <!-- New tab -->
-  <general>General Info</general>
+  <icsm>GNSS</icsm>  <!-- New tab -->
+  <general>Basic Info</general>
   <dateTabICSM>Dates</dateTabICSM>
   <metadataIcsm>Metadata</metadataIcsm>
   <contentInfoIcsm>Content</contentInfoIcsm>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-brief.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-brief.xsl
index 2feea3045d6..ae6d655ef46 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-brief.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-brief.xsl
@@ -27,7 +27,7 @@
   <xsl:template match="mdb:MD_Metadata|*[contains(@gco:isoType,'MD_Metadata')]">
     <xsl:variable name="info" select="geonet:info"/>
     <xsl:variable name="langId">
-      <xsl:call-template name="getLangId19115-3.2018">
+      <xsl:call-template name="getLangId19115-3.2018GNSS">
         <xsl:with-param name="langGui" select="$lang"/>
         <xsl:with-param name="md" select="."/>
       </xsl:call-template>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-full.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-full.xsl
index 02361c57fc6..584ea972eed 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-full.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-full.xsl
@@ -30,7 +30,7 @@
 
     <xsl:variable name="info" select="geonet:info"/>
     <xsl:variable name="langId">
-      <xsl:call-template name="getLangId19115-3.2018">
+      <xsl:call-template name="getLangId19115-3.2018GNSS">
         <xsl:with-param name="langGui" select="$lang"/>
         <xsl:with-param name="md" select="."/>
       </xsl:call-template>
@@ -56,7 +56,7 @@
       <xsl:for-each select="$identification">
         <xsl:for-each select="mri:citation/cit:CI_Citation/cit:title">
           <dc:title>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:title>
@@ -65,7 +65,7 @@
         <!-- Type - - - - - - - - - -->
         <xsl:for-each select="../../mdb:metadataScope/mdb:MD_MetadataScope/mdb:resourceScope/mcc:MD_ScopeCode/@codeListValue">
           <dc:type>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:type>
@@ -74,7 +74,7 @@
         <!-- subject -->
         <xsl:for-each select="mri:descriptiveKeywords/mri:MD_Keywords/mri:keyword[not(@gco:nilReason)]">
           <dc:subject>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:subject>
@@ -106,7 +106,7 @@
 
         <xsl:for-each select="mri:citation/cit:CI_Citation/cit:citedResponsibleParty/cit:CI_Responsibility[cit:role/cit:CI_RoleCode/@codeListValue='originator']/cit:party/cit:CI_Organisation/cit:name">
           <dc:creator>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:creator>
@@ -114,7 +114,7 @@
 
         <xsl:for-each select="mri:citation/cit:CI_Citation/cit:citedResponsibleParty/cit:CI_Responsibility[cit:role/cit:CI_RoleCode/@codeListValue='publisher']/cit:party/cit:CI_Organisation/cit:name">
           <dc:publisher>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:publisher>
@@ -122,7 +122,7 @@
 
         <xsl:for-each select="mri:citation/cit:CI_Citation/cit:citedResponsibleParty/cit:CI_Responsibility[cit:role/cit:CI_RoleCode/@codeListValue='author']/cit:party/cit:CI_Organisation/cit:name">
           <dc:contributor>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:contributor>
@@ -133,12 +133,12 @@
       <!-- abstract -->
       <xsl:for-each select="$identification/mri:abstract">
         <dct:abstract>
-          <xsl:apply-templates mode="localised19115-3.2018" select=".">
+          <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
             <xsl:with-param name="langId" select="$langId"/>
           </xsl:apply-templates>
         </dct:abstract>
         <dc:description>
-          <xsl:apply-templates mode="localised19115-3.2018" select=".">
+          <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
             <xsl:with-param name="langId" select="$langId"/>
           </xsl:apply-templates>
         </dc:description>
@@ -154,7 +154,7 @@
 
         <xsl:for-each select="$identification/mri:otherConstraints">
           <dc:rights>
-            <xsl:apply-templates mode="localised19115-3.2018" select=".">
+            <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
               <xsl:with-param name="langId" select="$langId"/>
             </xsl:apply-templates>
           </dc:rights>
@@ -171,7 +171,7 @@
       <!-- Lineage -->
       <xsl:for-each select="../../mdb:resourceLineage/mrl:LI_Lineage/mrl:statement">
         <dc:source>
-          <xsl:apply-templates mode="localised19115-3.2018" select=".">
+          <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
             <xsl:with-param name="langId" select="$langId"/>
           </xsl:apply-templates>
         </dc:source>
@@ -246,7 +246,7 @@
               <xsl:if test="cit:name/gco:CharacterString != ''">
                 <xsl:attribute name="name">
                   <xsl:for-each select="cit:name">
-                    <xsl:apply-templates mode="localised19115-3.2018" select=".">
+                    <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
                       <xsl:with-param name="langId" select="$langId"/>
                     </xsl:apply-templates>
                   </xsl:for-each>
@@ -256,7 +256,7 @@
               <xsl:if test="cit:description/gco:CharacterString != ''">
                 <xsl:attribute name="description">
                   <xsl:for-each select="cit:description">
-                    <xsl:apply-templates mode="localised19115-3.2018" select=".">
+                    <xsl:apply-templates mode="localised19115-3.2018GNSS" select=".">
                       <xsl:with-param name="langId" select="$langId"/>
                     </xsl:apply-templates>
                   </xsl:for-each>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-summary.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-summary.xsl
index cb9d87c77e2..e34a53df827 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-summary.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/present/csw/csw-summary.xsl
@@ -27,7 +27,7 @@
 
     <xsl:variable name="info" select="geonet:info"/>
     <xsl:variable name="langId">
-      <xsl:call-template name="getLangId19115-3.2018">
+      <xsl:call-template name="getLangId19115-3.2018GNSS">
         <xsl:with-param name="langGui" select="$lang"/>
         <xsl:with-param name="md" select="."/>
       </xsl:call-template>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/add-date-for-status-common.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/add-date-for-status-common.xsl
index 303c5252a79..89b9f27b2a0 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/add-date-for-status-common.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/add-date-for-status-common.xsl
@@ -10,11 +10,11 @@
 
   <xsl:variable name="dateTypes" as="node()+">
    <status is="completed" dateType="publication" schema="iso19139"/>
-    <status is="completed" dateType="publication" schema="iso19115-3.2018"/>
-    <status is="superseded" dateType="superseded" schema="iso19115-3.2018"/>
-    <status is="deprecated" dateType="deprecated" schema="iso19115-3.2018"/>
-    <status is="obsolete" dateType="deprecated" schema="iso19115-3.2018"/>
-    <status is="retired" dateType="deprecated" schema="iso19115-3.2018"/>
+    <status is="completed" dateType="publication" schema="iso19115-3.2018GNSS"/>
+    <status is="superseded" dateType="superseded" schema="iso19115-3.2018GNSS"/>
+    <status is="deprecated" dateType="deprecated" schema="iso19115-3.2018GNSS"/>
+    <status is="obsolete" dateType="deprecated" schema="iso19115-3.2018GNSS"/>
+    <status is="retired" dateType="deprecated" schema="iso19115-3.2018GNSS"/>
   </xsl:variable>
 
 
@@ -84,7 +84,7 @@
           </name>
           <operational>true</operational>
           <params>{
-            "dateTypeForStatus":{"type":"codelist", "codelist": "<xsl:value-of select="if ($schema = 'iso19115-3.2018') then 'cit:CI_DateTypeCode' else 'gmd:CI_DateTypeCode'"/>", "defaultValue":"<xsl:value-of select="$dateTypeForStatus"/>"},
+            "dateTypeForStatus":{"type":"codelist", "codelist": "<xsl:value-of select="if ($schema = 'iso19115-3.2018GNSS') then 'cit:CI_DateTypeCode' else 'gmd:CI_DateTypeCode'"/>", "defaultValue":"<xsl:value-of select="$dateTypeForStatus"/>"},
             "dateValueForStatus":{"type":"string", "defaultValue":"<xsl:value-of select="$dateValueForStatus"/>"}
           }</params>
         </suggestion>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/create-featurecatalogue-from-wfs.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/create-featurecatalogue-from-wfs.xsl
index d7d85388cf7..eb21ea96317 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/create-featurecatalogue-from-wfs.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/create-featurecatalogue-from-wfs.xsl
@@ -120,7 +120,7 @@
                 mdb:metadataExtensionInfo|
                 mdb:identificationInfo"/>
 
-      <xsl:copy-of select="geonet:make-iso19115-3.2018-featurecatalogue-from-wfs($featureCatWfsUrl)"/>
+      <xsl:copy-of select="geonet:make-iso19115-3.2018GNSS-featurecatalogue-from-wfs($featureCatWfsUrl)"/>
 
       <xsl:if test="not($featureCatIsReplacedBy)">
         <xsl:apply-templates
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dataset-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dataset-add.xsl
index 63f07c68143..3c6310d0fbb 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dataset-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dataset-add.xsl
@@ -15,7 +15,7 @@ a coupledResource reference.
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 exclude-result-prefixes="#all">
 
@@ -214,7 +214,7 @@ a coupledResource reference.
           <cit:CI_OnlineResource>
             <cit:linkage>
               <xsl:copy-of
-                select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLang, $useOnlyPTFreeText)"/>
+                select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLang, $useOnlyPTFreeText)"/>
             </cit:linkage>
             <cit:protocol>
               <gco:CharacterString>
@@ -235,7 +235,7 @@ a coupledResource reference.
             <cit:CI_OnlineResource>
               <cit:linkage>
                 <xsl:copy-of
-                  select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLang, $useOnlyPTFreeText)"/>
+                  select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLang, $useOnlyPTFreeText)"/>
               </cit:linkage>
               <cit:protocol>
                 <gco:CharacterString>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dq-report-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dq-report-add.xsl
index 4fcd563907d..f081cab569a 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dq-report-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/dq-report-add.xsl
@@ -35,7 +35,7 @@
   xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   exclude-result-prefixes="#all">
 
   <xsl:import href="../layout/utility-fn.xsl"/>
@@ -220,12 +220,12 @@
             <mdq:specification>
               <cit:CI_Citation>
                 <cit:title>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:title>
                 <cit:onlineResource>
                   <cit:CI_OnlineResource>
                     <cit:linkage>
-                      <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
+                      <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
                     </cit:linkage>
                   </cit:CI_OnlineResource>
                 </cit:onlineResource>
@@ -233,7 +233,7 @@
             </mdq:specification>
             <xsl:if test="$desc">
               <mdq:explanation>
-                <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
+                <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
               </mdq:explanation>
             </xsl:if>
             <mdq:pass>
@@ -261,12 +261,12 @@
         <mdq:reportReference>
           <cit:CI_Citation>
             <cit:title>
-              <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
+              <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
             </cit:title>
             <cit:onlineResource>
               <cit:CI_OnlineResource>
                 <cit:linkage>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:linkage>
               </cit:CI_OnlineResource>
             </cit:onlineResource>
@@ -274,7 +274,7 @@
         </mdq:reportReference>
         <xsl:if test="$desc">
           <mdq:abstract>
-            <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
+            <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
           </mdq:abstract>
         </xsl:if>
       </mdq:DQ_StandaloneQualityReportInformation>
@@ -292,19 +292,19 @@
     <mrl:additionalDocumentation>
       <cit:CI_Citation>
         <cit:title>
-          <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
+          <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
         </cit:title>
         <cit:onlineResource>
           <cit:CI_OnlineResource>
             <cit:linkage>
-              <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
+              <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
             </cit:linkage>
             <cit:protocol>
               <gco:CharacterString>WWW:LINK</gco:CharacterString>
             </cit:protocol>
             <xsl:if test="$desc">
               <cit:description>
-                <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
+                <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
               </cit:description>
             </xsl:if>
           </cit:CI_OnlineResource>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/fcats-file-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/fcats-file-add.xsl
index e0b8393ef72..8c5815aa05d 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/fcats-file-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/fcats-file-add.xsl
@@ -33,7 +33,7 @@
   xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   exclude-result-prefixes="#all">
 
   <xsl:import href="../layout/utility-fn.xsl"/>
@@ -106,12 +106,12 @@
         <mrc:featureCatalogueCitation>
           <cit:CI_Citation>
             <cit:title>
-              <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
+              <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
             </cit:title>
             <cit:onlineResource>
               <cit:CI_OnlineResource>
                 <cit:linkage>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:linkage>
               </cit:CI_OnlineResource>
             </cit:onlineResource>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/legend-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/legend-add.xsl
index d7ca870314e..ee10a2240eb 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/legend-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/legend-add.xsl
@@ -34,7 +34,7 @@
   xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   exclude-result-prefixes="#all">
 
   <xsl:import href="../layout/utility-fn.xsl"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/onlinesrc-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/onlinesrc-add.xsl
index 61ee24404dd..336984d69f8 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/onlinesrc-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/onlinesrc-add.xsl
@@ -10,7 +10,7 @@
   xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0"
   xmlns:gn="http://www.fao.org/geonetwork"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   exclude-result-prefixes="#all">
 
   <xsl:import href="../layout/utility-fn.xsl"/>
@@ -177,7 +177,7 @@
             <mrd:onLine>
               <cit:CI_OnlineResource>
                 <cit:linkage>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, '\|', '', $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, '\|', '', $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:linkage>
 
                 <xsl:if test="$protocol != ''">
@@ -198,14 +198,14 @@
 
                 <xsl:if test="normalize-space(.) != ''">
                   <cit:name>
-                    <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement(., $mainLangId, $useOnlyPTFreeText)"/>
+                    <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement(., $mainLangId, $useOnlyPTFreeText)"/>
                   </cit:name>
                 </xsl:if>
                 <xsl:variable name="pos" select="position()"/>
                 <xsl:variable name="description" select="tokenize($desc, ',')[position() = $pos]"/>
                 <xsl:if test="$description != ''">
                   <cit:description>
-                    <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($description, $mainLangId, $useOnlyPTFreeText)"/>
+                    <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($description, $mainLangId, $useOnlyPTFreeText)"/>
                   </cit:description>
                 </xsl:if>
 
@@ -223,7 +223,7 @@
           <mrd:onLine>
             <cit:CI_OnlineResource>
               <cit:linkage>
-                <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($url, '\|', '', $mainLangId, $useOnlyPTFreeText)"/>
+                <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($url, '\|', '', $mainLangId, $useOnlyPTFreeText)"/>
               </cit:linkage>
 
               <xsl:if test="$protocol != ''">
@@ -242,13 +242,13 @@
 
               <xsl:if test="normalize-space($name) != ''">
                 <cit:name>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($name, $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:name>
               </xsl:if>
 
               <xsl:if test="$desc != ''">
                 <cit:description>
-                  <xsl:copy-of select="gn-fn-iso19115-3.2018:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
+                  <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:fillTextElement($desc, $mainLangId, $useOnlyPTFreeText)"/>
                 </cit:description>
               </xsl:if>
 
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/process-utility.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/process-utility.xsl
index 9eab08dad3c..b46e4728b95 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/process-utility.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/process-utility.xsl
@@ -39,7 +39,7 @@
   <!-- Catalog URL from protocol to lang -->
   <xsl:param name="catalogUrl" select="''"/>
   <xsl:param name="nodeId" select="''"/>
-  <xsl:variable name="schema" select="'iso19115-3.2018'"/>
+  <xsl:variable name="schema" select="'iso19115-3.2018GNSS'"/>
 
   <!-- Search for any of the searchStrings provided -->
   <xsl:function name="gn:parseBoolean" as="xs:boolean">
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/service-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/service-add.xsl
index 7404e18fc3b..e29d143c10a 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/service-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/service-add.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--  
+<!--
 Stylesheet used to link a service to a dataset
 by adding a reference to the distribution section.
 -->
@@ -13,7 +13,7 @@ by adding a reference to the distribution section.
                 xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3"
                 xmlns:gn="http://www.fao.org/geonetwork"
                 exclude-result-prefixes="#all">
   <xsl:import href="dataset-add.xsl"/>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/thumbnail-add.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/thumbnail-add.xsl
index b27471feb37..851d8e27beb 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/thumbnail-add.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/process/thumbnail-add.xsl
@@ -8,7 +8,7 @@
                 xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:gn="http://www.fao.org/geonetwork"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS:"
                 exclude-result-prefixes="#all" version="2.0">
 
   <xsl:import href="../layout/utility-fn.xsl"/>
@@ -133,7 +133,7 @@
           <xsl:if test="$thumbnail_desc!=''">
             <mcc:fileDescription>
               <xsl:copy-of
-                      select="gn-fn-iso19115-3.2018:fillTextElement($thumbnail_desc, $mainLang, $useOnlyPTFreeText)"/>
+                      select="gn-fn-iso19115-3.2018GNSS::fillTextElement($thumbnail_desc, $mainLang, $useOnlyPTFreeText)"/>
             </mcc:fileDescription>
           </xsl:if>
           <xsl:if test="$thumbnail_type!=''">
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/schema-ident.xml b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/schema-ident.xml
index 69d47fb7380..306de3b070e 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/schema-ident.xml
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/schema-ident.xml
@@ -38,7 +38,7 @@ More information:
 - `Using the latest ISO Standard for Geographic Information (ISO19115-1) for an INSPIRE Discovery Service <http://cnig.gouv.fr/wp-content/uploads/2015/06/titellus_fx_prunayre_iso19115-3_inspire2015.pdf>`_
 
 
-This standard is maintained on https://github.com/metadata101/iso19115-3.2018
+This standard is maintained on https://github.com/metadata101/iso19115-3.2018GNSS
 and is available by default in GeoNetwork 3.8+. The TC211 is maintaining the XSD for this standard on https://github.com/ISO-TC211/XML.
 
 
@@ -77,24 +77,12 @@ Ce schéma est également composé des normes :
   <standardUrl xml:lang="fr">http://www.iso.org/iso/fr/home/store/catalogue_tc/catalogue_detail.htm?csnumber=32579</standardUrl>
   <!-- FIXME: add all required schemas -->
   <schemaLocation>http://standards.iso.org/iso/19115/-3/mdb/2.0 https://schemas.isotc211.org/19115/-3/mdb/2.0/mdb.xsd</schemaLocation>
-  <autodetect xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
-              xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
-              xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0"
-              xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
-              xmlns:mrs="http://standards.iso.org/iso/19115/-3/mrs/1.0"
-              xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
-              xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
-              xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0"
-              xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1">
-    <!-- ISO19115-3 identification is based on the
-    root element of the record. It could be a MD_Metadata
-    element (for a metadata recocrd) or some other eleement
-    when used as a subtemplate (cf. directory support).
-    -->
+  <autodetect>
     <elements>
-      <mdb:metadataProfile xmlns:gn="http://www.fao.org/geonetwork"
-                           xmlns:gmd="http://standards.iso.org/iso/19115/-3/mdb/1.0"
-                           xmlns:geonet="http://www.fao.org/geonetwork">
+      <mdb:metadataProfile xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
+                           xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
+                           xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0"
+                           xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0">
         <cit:CI_Citation>
           <cit:title>
             <gco:CharacterString>GNSSMetadataProfile_v3</gco:CharacterString>
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info-subtemplate.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info-subtemplate.xsl
index 79cc61e11bb..3b11d1d1879 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info-subtemplate.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info-subtemplate.xsl
@@ -39,7 +39,7 @@
                 xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
                 xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+                xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:saxon="http://saxon.sf.net/"
diff --git a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info.xsl b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info.xsl
index 249cff44005..a7dfd9f080c 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info.xsl
+++ b/schemas/iso19115-3.2018GNSS/src/main/plugin/iso19115-3.2018GNSS/update-fixed-info.xsl
@@ -17,7 +17,7 @@
   xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0"
   xmlns:gfc="http://standards.iso.org/iso/19110/gfc/1.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
+  xmlns:gn-fn-iso19115-3.2018GNSS="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018GNSS"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:java="java:org.fao.geonet.util.XslUtil"
@@ -74,7 +74,7 @@
     <xsl:copy copy-namespaces="no">
       <xsl:apply-templates select="@*"/>
 
-      <xsl:call-template name="add-iso19115-3.2018-namespaces"/>
+      <xsl:call-template name="add-iso19115-3.2018GNSSGNSS-namespaces"/>
 
       <xsl:for-each select="mdb:metadataIdentifier">
         <xsl:copy>
@@ -128,12 +128,12 @@
                     or (/root/env/createDate != ''
                         and /root/env/newRecord = 'true')">
         <mdb:dateInfo>
-          <xsl:copy-of select="gn-fn-iso19115-3.2018:write-date-or-dateTime(/root/env/createDate, 'creation')"/>
+          <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:write-date-or-dateTime(/root/env/createDate, 'creation')"/>
         </mdb:dateInfo>
       </xsl:if>
       <xsl:if test="not($isRevisionDateAvailable)">
         <mdb:dateInfo>
-          <xsl:copy-of select="gn-fn-iso19115-3.2018:write-date-or-dateTime(/root/env/changeDate, 'revision')"/>
+          <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:write-date-or-dateTime(/root/env/changeDate, 'revision')"/>
         </mdb:dateInfo>
       </xsl:if>
 
@@ -144,7 +144,7 @@
         <xsl:choose>
           <xsl:when test="$currentDateType = 'revision' and /root/env/changeDate">
             <mdb:dateInfo>
-              <xsl:copy-of select="gn-fn-iso19115-3.2018:write-date-or-dateTime(/root/env/changeDate, 'revision')"/>
+              <xsl:copy-of select="gn-fn-iso19115-3.2018GNSS:write-date-or-dateTime(/root/env/changeDate, 'revision')"/>
             </mdb:dateInfo>
           </xsl:when>
           <xsl:when test="$currentDateType = 'creation'
@@ -306,7 +306,7 @@
       <xsl:apply-templates select="@*[not(name() = 'gco:nilReason') and not(name() = 'xsi:type')]"/>
 
       <xsl:variable name="excluded"
-                    select="gn-fn-iso19115-3.2018:isNotMultilingualField(., $editorConfig)"/>
+                    select="gn-fn-iso19115-3.2018GNSS:isNotMultilingualField(., $editorConfig)"/>
 
       <xsl:variable name="valueInPtFreeTextForMainLanguage"
                     select="normalize-space(lan:PT_FreeText/*/lan:LocalisedCharacterString[
diff --git a/schemas/iso19115-3.2018GNSS/src/main/resources/config-spring-geonetwork.xml b/schemas/iso19115-3.2018GNSS/src/main/resources/config-spring-geonetwork.xml
index ee08ec080ca..4f08109278d 100644
--- a/schemas/iso19115-3.2018GNSS/src/main/resources/config-spring-geonetwork.xml
+++ b/schemas/iso19115-3.2018GNSS/src/main/resources/config-spring-geonetwork.xml
@@ -4,7 +4,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-  <bean id="iso19115-3.2018SchemaPlugin"
+  <bean id="iso19115-3.2018GNSSSchemaPlugin"
         class="org.fao.geonet.schema.iso19115_3_2018.ISO19115_3_2018SchemaPlugin">
     <property name="xpathTitle">
       <util:list value-type="java.lang.String">
@@ -16,7 +16,7 @@
     When using a custom parent relation mechanism, the editor needs to be
     updated in order to create the proper link (instead of the default parentMetadata mode).
     See web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/onlinesrcList.html
-      <li data-ng-show="gnCurrentEdit.metadata['geonet:info'].schema == 'iso19115-3.2018'
+      <li data-ng-show="gnCurrentEdit.metadata['geonet:info'].schema == 'iso19115-3.2018GNSS'
           && !gnCurrentEdit.isService
           && gnCurrentEdit.metadata.type.indexOf('series') === -1">
             <a href=""