diff --git a/19115/-1/mdb/1.3.0/mdb.xsd b/19115/-1/mdb/1.3.0/mdb.xsd
index 7f9521c5..8efcf1f3 100644
--- a/19115/-1/mdb/1.3.0/mdb.xsd
+++ b/19115/-1/mdb/1.3.0/mdb.xsd
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema
   xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:cit="https://schemas.isotc211.org/19115/-1/cit/1.3"
-  xmlns:dqc="https://schemas.isotc211.org/19157/-/dqc/1.2"
-  xmlns:lan="https://schemas.isotc211.org/19115/-1/lan/1.3"
-  xmlns:mcc="https://schemas.isotc211.org/19115/-1/mcc/1.3"
-  xmlns:mda="https://schemas.isotc211.org/19115/-1/mda/1.3"
   xmlns:mdb="https://schemas.isotc211.org/19115/-1/mdb/1.3"
-  xmlns:mri="https://schemas.isotc211.org/19115/-1/mri/1.3" 
-  xmlns:msr="https://schemas.isotc211.org/19115/-1/msr/1.3" 
   elementFormDefault="qualified"
   targetNamespace="https://schemas.isotc211.org/19115/-1/mdb/1.3" 
   version="1.3.0"
@@ -17,15 +10,4 @@
     <documentation>Wrapper namespace to support Catalog Service implementations</documentation>
   </annotation>
   <include schemaLocation="metadataBase.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/cit/1.3" schemaLocation="../../../../19115/-1/cit/1.3.0/cit.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19157/-/dqc/1.2" schemaLocation="../../../../19157/-/dqc/1.2.0/dqc.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/lan/1.3" schemaLocation="../../../../19115/-1/lan/1.3.0/lan.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/mcc/1.3" schemaLocation="../../../../19115/-1/mcc/1.3.0/mcc.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/mda/1.3" schemaLocation="../../../../19115/-1/mda/1.3.0/mda.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/mri/1.3" schemaLocation="../../../../19115/-1/mri/1.3.0/mri.xsd"/>
-  <import namespace="https://schemas.isotc211.org/19115/-1/msr/1.3" schemaLocation="../../../../19115/-1/msr/1.3.0/msr.xsd"/>
-  <!-- need to import gex because bounding box is mandatory if metadataScope is dataset -->
-  <import namespace="https://schemas.isotc211.org/19115/-1/gex/1.3"
- schemaLocation="../../../../19115/-1/gex/1.3.0/gex.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
 </schema>
diff --git a/19115/-1/mdb/1.3.0/metadataBase.xsd b/19115/-1/mdb/1.3.0/metadataBase.xsd
index 7d1a3d49..a42e5c09 100644
--- a/19115/-1/mdb/1.3.0/metadataBase.xsd
+++ b/19115/-1/mdb/1.3.0/metadataBase.xsd
@@ -83,7 +83,7 @@
           <element name="contentInfo" maxOccurs="unbounded" minOccurs="0" type="mcc:Abstract_ContentInformation_PropertyType" id="ISO19115-1.030_ISO19115-1.182"/>
           <element name="distributionInfo" maxOccurs="unbounded" minOccurs="0" type="mcc:Abstract_Distribution_PropertyType" id="ISO19115-1.031_ISO19115-1.237"/>
           <element name="dataQualityInfo" maxOccurs="unbounded" minOccurs="0" type="dqc:Abstract_DataQuality_PropertyType" id="ISO19115-1.032_ISO19157.001"/>
-          <!-- Moved to 37 -->
+         <!-- Moved to 37 -->
           <!-- <element name="resourceLineage" maxOccurs="unbounded" minOccurs="0" type="mcc:Abstract_LineageInformation_PropertyType" id="ISO19115-1.037_ISO19115-1.118"/> -->
           <element name="portrayalCatalogueInfo" maxOccurs="unbounded" minOccurs="0" type="mcc:Abstract_PortrayalCatalogueInformation_PropertyType" id="ISO19115-1.033_ISO19115-1.235"/>
           <element name="metadataConstraints" maxOccurs="unbounded" minOccurs="0" type="mcc:Abstract_Constraints_PropertyType" id="ISO19115-1.034_ISO19115-1.098"/>
diff --git a/19115/-3/md2/1.0/metadataWithExtensions.xsd b/19115/-3/md2/1.0/metadataWithExtensions.xsd
index d83d425d..81ee9d34 100644
--- a/19115/-3/md2/1.0/metadataWithExtensions.xsd
+++ b/19115/-3/md2/1.0/metadataWithExtensions.xsd
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/md2/1.0" version="1.0">
-  <include schemaLocation="md2.xsd"/>
-  <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" elementFormDefault="qualified"
+    targetNamespace="http://standards.iso.org/iso/19115/-3/md2/1.0" version="1.0">
+    <include schemaLocation="md2.xsd"/>
+    <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
 </schema>
diff --git a/19115/-3/mda/1.0/mda.xsd b/19115/-3/mda/1.0/mda.xsd
index 6140bf1c..75ce1db4 100644
--- a/19115/-3/mda/1.0/mda.xsd
+++ b/19115/-3/mda/1.0/mda.xsd
@@ -1,4 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" elementFormDefault="qualified" targetNamespace="http://standards.iso.org/iso/19115/-3/mda/1.0" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<schema 
+  xmlns="http://www.w3.org/2001/XMLSchema" 
+  xmlns:md2="http://standards.iso.org/iso/19115/-3/md2/1.0" 
+  xmlns:mda="http://standards.iso.org/iso/19115/-3/mda/1.0" 
+  elementFormDefault="qualified" 
+  targetNamespace="http://standards.iso.org/iso/19115/-3/mda/1.0" 
+  version="1.0">
   <annotation>
     <documentation>Namespace for XML elements &lt;font color="#1f497d"&gt;for metadata applications describing aggregated resources with linked metadata records&lt;/font&gt;</documentation>
   </annotation>
diff --git a/19115/resources/transforms/19115-3-2016-2022/ISO19115-1-2_Reorder.xsl b/19115/resources/transforms/19115-3-2016-2022/ISO19115-1-2_Reorder.xsl
index 83a2f9ce..8fde96bc 100644
--- a/19115/resources/transforms/19115-3-2016-2022/ISO19115-1-2_Reorder.xsl
+++ b/19115/resources/transforms/19115-3-2016-2022/ISO19115-1-2_Reorder.xsl
@@ -19,7 +19,7 @@
     xmlns:msr="https://schemas.isotc211.org/19115/-1/msr/1.3"
     xmlns:srv="https://schemas.isotc211.org/19115/-1/srv/1.3"
     xmlns:mac="https://schemas.isotc211.org/19115/-2/mac/2.2"
-    xmlns:cat="https://schemas.isotc211.org/19115/-3/cat/1.0"
+    xmlns:cat="https://schemas.isotc211.org/19139/-/cat/1.2"
     xmlns:gco="https://schemas.isotc211.org/19103/-/gco/1.2"
     xmlns:gcx="https://schemas.isotc211.org/19103/-/gcx/1.2"
     xmlns:gfc="https://schemas.isotc211.org/19110/-/gfc/2.2"