diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 9adc3603952b5cda989071bbac4e95707ebea8aa..348a321b0afbc7fb33fd76fb2713cbf2da4b3749 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -23,18 +23,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
-
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
+	
 	
 	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index ac4b0da18d2d04453053333ec07f07f1990b89e1..593fa57933e2a05a0cc8865b15eb8cb709831884 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -23,17 +23,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 
 	
 	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index 54a028568d8965c903ec6cb9080a5d207ada4b81..81476919c79e1e2cdd861c842fb56f9e3e533437 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -22,18 +22,18 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" schemaLocation="SEC-commonTypes.xsd" />
 	
 	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index 895be89957a82fdb884ea4917db9329aeeeb21f5..0b1c390083b873466ff467ff595f45c143dd487b 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.xsd
@@ -23,11 +23,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.onem2m.org/xml/deviceConfig"
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<!-- <xs:include schemaLocation="CDT-enumerationTypes-v2_16_0.xsd" />  -->
+	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
 
 	<!--********************** -->
 	<!-- Simple Types   -->
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index a7dece28b1f58e1b6df768c0f43b0687bce6e5d7..b8e6b02d3979c4cd0370a7a6178fa1907ae17912 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -23,14 +23,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" 
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 	
 	
 	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 0089d59e7058dad9dd19dba19d58dedfb4199894..e5e3adce00cf9ff4fe40f52dfe2ea99bfb33bb12 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -23,15 +23,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" schemaLocation="SEC-commonTypes.xsd" />
 	
 	
 	<xs:element name="myCertFileCred" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index 19834d5477215fc17e2bbd6dbe9d32cf05f65040..1330e957610eead644af3ceac66cee747a6add22 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -23,12 +23,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 	
 	
 	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 2ff1f5203d50caa4be7f0e5b00667849376be57b..ed8e780a3ddd62e9c6bf0acfef18ac0fff73dbe7 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -23,17 +23,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/deviceConfig" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols"  
-	xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig"
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
 	<xs:include schemaLocation="DCFG-commonTypes.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v2_16_0.xsd" />
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_16_0.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
+	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" />
 
 	
 	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/README.md b/README.md
index 0f58cd4ee6e6cf2c4e9829c6abd17686c986e919..707ced199e0123b48d96b5d2455d46b23f4c74d5 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,12 @@ This is the repository for developing XML schema for the reource types defined i
 
 \<trustAnchorCred\>
 
-DCFG-commonTypes-vx_y_0.xsd defines data types common to all resource types
+DCFG-commonTypes.xsd defines data types common to all resource types
 
 Note: The required xsd files CDT-commonTypes can be downloaded from 
-      https://git.onem2m.org/PRO/schema-definitions.git
+      https://git.onem2m.org/schema-definitions/ts-0004.git
 
-      The required xsd files SEC-commonTypes-vx_y_0 can be downloaded from 
-      https://git.onem2m.org/SEC/MAF-MEF.git
+      The required xsd files SEC-commonTypes can be downloaded from 
+      https://git.onem2m.org/schema-definitions/ts-0003.git