diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 9adc3603952b5cda989071bbac4e95707ebea8aa..c3b56a9bd52291a73093e13e45d8427db5ea2d73 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	
 	<xs:element name="MAFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index ac4b0da18d2d04453053333ec07f07f1990b89e1..c58451b310f6803d46cb420a97b1b287babee3d4 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -32,8 +32,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 
 	
 	<xs:element name="MEFClientRegCfg" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index 54a028568d8965c903ec6cb9080a5d207ada4b81..110aff9ca1cc5b81fa8f58050cbe521548d15a3e 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -31,8 +31,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	<xs:element name="authenticationProfile" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index a7dece28b1f58e1b6df768c0f43b0687bce6e5d7..86bff4c8a6e6be9e260be06805ec136df5550372 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	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="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	
 	
 	<xs:element name="dataCollection" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 0089d59e7058dad9dd19dba19d58dedfb4199894..081b3d86571cbd01ed856b746cba1ff664b5f90d 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -29,8 +29,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	<xs:import namespace="http://www.onem2m.org/xml/securityProtocols" schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
 	
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index 19834d5477215fc17e2bbd6dbe9d32cf05f65040..d9fac9219db88ac4235634763dd19fdb8a61ab93 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:dcfg="http://www.onem2m.org/xml/deviceConfig" 
 	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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
 	
 	
 	<xs:element name="registration" substitutionGroup="m2m:sg_mgmtResource">
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 2ff1f5203d50caa4be7f0e5b00667849376be57b..ef4a028a73b41a3605267efe6ef89a55adefb49b 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -32,9 +32,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<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/protocols" schemaLocation="CDT-subscription-v3_8_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
+	
 	
 	<xs:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>