diff --git a/schemas/iso19115-3.2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java b/schemas/iso19115-3.2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java
index 1f878565c62..923153b2ece 100644
--- a/schemas/iso19115-3.2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java
+++ b/schemas/iso19115-3.2018/src/main/java/org/fao/geonet/schema/iso19115_3_2018/ISO19115_3_2018SchemaPlugin.java
@@ -79,7 +79,7 @@ public class ISO19115_3_2018SchemaPlugin
             .put("csw:Record", Namespace.getNamespace("csw", "http://www.opengis.net/cat/csw/2.0.2"))
             .put("mdb:MD_Metadata", Namespace.getNamespace("mdb", "http://standards.iso.org/iso/19115/-3/mdb/2.0"))
             .put("gmd:MD_Metadata", Namespace.getNamespace("gmd", "http://www.isotc211.org/2005/gmd"))
-            .put("dcat-ap", Namespace.getNamespace("dcatap", "http://data.europa.eu/930/"))
+            .put("dcat-ap", Namespace.getNamespace("geodcatap", "http://data.europa.eu/930/"))
             .build();
 
         allExportFormats = ImmutableMap.<String, String>builder()
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-brief.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-brief.xsl
similarity index 96%
rename from schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-brief.xsl
rename to schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-brief.xsl
index 3f7d6d5d841..ad626f5582d 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-brief.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-brief.xsl
@@ -23,5 +23,5 @@
   -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="2.0">
-  <xsl:import href="dcatap-full.xsl"/>
+  <xsl:import href="geodcatap-full.xsl"/>
 </xsl:stylesheet>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-full.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-full.xsl
similarity index 98%
rename from schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-full.xsl
rename to schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-full.xsl
index 02a91db67a9..9871123fcae 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-full.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-full.xsl
@@ -27,7 +27,7 @@
                 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                 xmlns:gmd="http://www.isotc211.org/2005/gmd"
                 version="2.0">
-  <xsl:import href="../../../iso19139/present/csw/dcatap-full.xsl"/>
+  <xsl:import href="../../../iso19139/present/csw/geodcatap-full.xsl"/>
   <xsl:import href="../../convert/ISO19139/toISO19139.xsl"/>
 
   <xsl:output method="xml"
diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-summary.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-summary.xsl
similarity index 96%
rename from schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-summary.xsl
rename to schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-summary.xsl
index 3f7d6d5d841..ad626f5582d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-summary.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/geodcatap-summary.xsl
@@ -23,5 +23,5 @@
   -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="2.0">
-  <xsl:import href="dcatap-full.xsl"/>
+  <xsl:import href="geodcatap-full.xsl"/>
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java b/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java
index e26ee6771ad..8f25a3332fe 100644
--- a/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java
+++ b/schemas/iso19139/src/main/java/org/fao/geonet/schema/iso19139/ISO19139SchemaPlugin.java
@@ -83,7 +83,7 @@ public class ISO19139SchemaPlugin
             .put("csw:Record", Namespace.getNamespace("csw", "http://www.opengis.net/cat/csw/2.0.2"))
             .put("gmd:MD_Metadata", GMD)
             .put("dcat", Namespace.getNamespace("dcat", "http://www.w3.org/ns/dcat#"))
-            .put("dcat-ap", Namespace.getNamespace("dcatap", "http://data.europa.eu/930/"))
+            .put("dcat-ap", Namespace.getNamespace("geodcatap", "http://data.europa.eu/930/"))
             .build();
 
         allExportFormats = ImmutableMap.<String, String>builder()
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-summary.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-brief.xsl
similarity index 96%
rename from schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-summary.xsl
rename to schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-brief.xsl
index 3f7d6d5d841..ad626f5582d 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/present/csw/dcatap-summary.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-brief.xsl
@@ -23,5 +23,5 @@
   -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="2.0">
-  <xsl:import href="dcatap-full.xsl"/>
+  <xsl:import href="geodcatap-full.xsl"/>
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-full.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-full.xsl
similarity index 99%
rename from schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-full.xsl
rename to schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-full.xsl
index 4bcda824c30..c4d7257104a 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-full.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-full.xsl
@@ -82,6 +82,7 @@
   xmlns:vcard  = "http://www.w3.org/2006/vcard/ns#"
   xmlns:wdrs   = "http://www.w3.org/2007/05/powder-s#"
   xmlns:xlink  = "http://www.w3.org/1999/xlink"
+  xmlns:xs     = "http://www.w3.org/2001/XMLSchema"
   xmlns:xsi    = "http://www.w3.org/2001/XMLSchema-instance"
   xmlns:xsl    = "http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="#all"
@@ -4026,7 +4027,8 @@
       </xsl:when>
       <xsl:otherwise>
         <xsl:choose>
-          <xsl:when test="$code = number($code) and (translate($codespace,$uppercase,$lowercase) = 'epsg' or starts-with(translate($codespace,$uppercase,$lowercase),translate($EpsgSrsBaseUrn,$uppercase,$lowercase)))">
+          <xsl:when test="$code castable as xs:double and $code = number($code) and (translate($codespace,$uppercase,$lowercase) = 'epsg'
+                          or starts-with(translate($codespace,$uppercase,$lowercase),translate($EpsgSrsBaseUrn,$uppercase,$lowercase)))">
             <dct:conformsTo>
               <rdf:Description rdf:about="{$EpsgSrsBaseUri}/{$code}">
                 <rdf:type rdf:resource="{$dct}Standard"/>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-summary.xsl
similarity index 96%
rename from schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-brief.xsl
rename to schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-summary.xsl
index 3f7d6d5d841..ad626f5582d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcatap-brief.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/geodcatap-summary.xsl
@@ -23,5 +23,5 @@
   -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="2.0">
-  <xsl:import href="dcatap-full.xsl"/>
+  <xsl:import href="geodcatap-full.xsl"/>
 </xsl:stylesheet>