diff --git a/v3_0_0/DCFG-MAFClientRegCfg-v3_0_0.xsd b/v3_0_0/DCFG-MAFClientRegCfg-v3_0_0.xsd
index 8911a839b13a0cc4391ccb83652fed9221458a1e..0c16c95c929b8c4dd8db35c08d3d4a88cc17bab0 100644
--- a/v3_0_0/DCFG-MAFClientRegCfg-v3_0_0.xsd
+++ b/v3_0_0/DCFG-MAFClientRegCfg-v3_0_0.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v3_0_0.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/v3_0_0/DCFG-MEFClientRegCfg-v3_0_0.xsd b/v3_0_0/DCFG-MEFClientRegCfg-v3_0_0.xsd
index 0f99408799a5b4e18d419395def9745ae21f0417..4236b7cf5e5d8b211aa395bba9afdd441094a463 100644
--- a/v3_0_0/DCFG-MEFClientRegCfg-v3_0_0.xsd
+++ b/v3_0_0/DCFG-MEFClientRegCfg-v3_0_0.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v3_0_0.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/v3_0_0/DCFG-authenticationProfile-v3_0_0.xsd b/v3_0_0/DCFG-authenticationProfile-v3_0_0.xsd
index a958c62974477f4e1a287481e83a511037154178..49374f9ae0e036279c06a58d5e56639e9eeedeb2 100644
--- a/v3_0_0/DCFG-authenticationProfile-v3_0_0.xsd
+++ b/v3_0_0/DCFG-authenticationProfile-v3_0_0.xsd
@@ -29,10 +29,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:sec="http://www.onem2m.org/xml/securityProtocols"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v3_0_0.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/v3_0_0/DCFG-dataCollection-v3_0_0.xsd b/v3_0_0/DCFG-dataCollection-v3_0_0.xsd
index ca60501a2edabd1fc3599807041d81a398864249..b23ca18f7ac6603f167cd01a1ccf8d7b31126b80 100644
--- a/v3_0_0/DCFG-dataCollection-v3_0_0.xsd
+++ b/v3_0_0/DCFG-dataCollection-v3_0_0.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/v3_0_0/DCFG-myCertFileCred-v3_0_0.xsd b/v3_0_0/DCFG-myCertFileCred-v3_0_0.xsd
index c4f4201f6a5d7ca2f2649947e17f8b0e5e6afd5d..51e2766a9f51da19e898088cdeb3f8d92fd14b40 100644
--- a/v3_0_0/DCFG-myCertFileCred-v3_0_0.xsd
+++ b/v3_0_0/DCFG-myCertFileCred-v3_0_0.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/v3_0_0/DCFG-registration-v3_0_0.xsd b/v3_0_0/DCFG-registration-v3_0_0.xsd
index 80b73fbeed25fd5101f2a9bb13e207b31afd0d55..1c3978dc94538f5ce25d2882eab4f9d36426ffd5 100644
--- a/v3_0_0/DCFG-registration-v3_0_0.xsd
+++ b/v3_0_0/DCFG-registration-v3_0_0.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/v3_0_0/DCFG-trustAnchorCred-v3_0_0.xsd b/v3_0_0/DCFG-trustAnchorCred-v3_0_0.xsd
index d8b7e5d5d1943c47473b57dcf3726b8e00318982..3687b65cb25107b415ffe1ea6074e23561fcca18 100644
--- a/v3_0_0/DCFG-trustAnchorCred-v3_0_0.xsd
+++ b/v3_0_0/DCFG-trustAnchorCred-v3_0_0.xsd
@@ -30,11 +30,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
-	<xs:include schemaLocation="DCFG-commonTypes-v2_3_0.xsd" />
+	<xs:include schemaLocation="DCFG-commonTypes-v3_0_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/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:element name="trustAnchorCred" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>