diff --git a/v2_1_0/SEC-MAFBase-v2_1_0.xsd b/v2_1_0/SEC-MAFBase-v2_1_0.xsd
index f8f25528a9db100dbf15f9b1266e0fce16847a25..aa2b9a913f5af1bfd14fc5fb79de53801ab73d65 100644
--- a/v2_1_0/SEC-MAFBase-v2_1_0.xsd
+++ b/v2_1_0/SEC-MAFBase-v2_1_0.xsd
@@ -27,11 +27,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-    <xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
-	<xs:include schemaLocation="SEC-mafClientReg-v2_0_0.xsd" />
-    <xs:include schemaLocation="SEC-symmKeyReg-v2_0_0.xsd" />
+    <xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="SEC-mafClientReg-v2_1_0.xsd" />
+    <xs:include schemaLocation="SEC-symmKeyReg-v2_1_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
     
     
 	<xs:element name="MAFBase" substitutionGroup="m2m:sg_resource">
diff --git a/v2_1_0/SEC-MEFBase-v2_1_0.xsd b/v2_1_0/SEC-MEFBase-v2_1_0.xsd
index cd30135c2d7fc5f39a0369d42d00de92eb0b981f..2db490a6e63d899f3109c5cd952b032b2c89ce1a 100644
--- a/v2_1_0/SEC-MEFBase-v2_1_0.xsd
+++ b/v2_1_0/SEC-MEFBase-v2_1_0.xsd
@@ -27,11 +27,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-    <xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
-	<xs:include schemaLocation="SEC-mefClientReg-v2_0_0.xsd" />
-    <xs:include schemaLocation="SEC-symmKeyReg-v2_0_0.xsd" />
+    <xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="SEC-mefClientReg-v2_1_0.xsd" />
+    <xs:include schemaLocation="SEC-symmKeyReg-v2_1_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
     
     
 	<xs:element name="MEFBase" substitutionGroup="m2m:sg_resource">
diff --git a/v2_1_0/SEC-commonTypes-v2_1_0.xsd b/v2_1_0/SEC-commonTypes-v2_1_0.xsd
index 536ddec7ac61208b11fd74061f53b170a219a3cb..dc5f0cc23ff5528d8d36b2f99c732998fab02d75 100644
--- a/v2_1_0/SEC-commonTypes-v2_1_0.xsd
+++ b/v2_1_0/SEC-commonTypes-v2_1_0.xsd
@@ -27,7 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 
 	<!--********************** -->
 	<!-- Simple Types   -->
diff --git a/v2_1_0/SEC-mafClientReg-v2_1_0.xsd b/v2_1_0/SEC-mafClientReg-v2_1_0.xsd
index 8e57c86220bd5056e8441d0283f706230afb2ddd..ee427f64e40c610b307953baa0a25a4b6351b8b0 100644
--- a/v2_1_0/SEC-mafClientReg-v2_1_0.xsd
+++ b/v2_1_0/SEC-mafClientReg-v2_1_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 	
     
 	<xs:element name="mafClientReg" substitutionGroup="m2m:sg_resource">
diff --git a/v2_1_0/SEC-mefClientCmd-v2_1_0.xsd b/v2_1_0/SEC-mefClientCmd-v2_1_0.xsd
index ff99d531c2b25e175ca6319cb596f1540422a81f..8b8eadaaa80fff0a0a1ce33977bfe7d5222a5bfd 100644
--- a/v2_1_0/SEC-mefClientCmd-v2_1_0.xsd
+++ b/v2_1_0/SEC-mefClientCmd-v2_1_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 	
     
     
diff --git a/v2_1_0/SEC-mefClientReg-v2_1_0.xsd b/v2_1_0/SEC-mefClientReg-v2_1_0.xsd
index d473985bc6cd4a8a6b95f396b2c22663d84c4242..51378669c0955fbefcc92e891441d8b8daf175b5 100644
--- a/v2_1_0/SEC-mefClientReg-v2_1_0.xsd
+++ b/v2_1_0/SEC-mefClientReg-v2_1_0.xsd
@@ -27,10 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
-	<xs:include schemaLocation="SEC-mefClientCmd-v2_0_0.xsd" />
+	<xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
+	<xs:include schemaLocation="SEC-mefClientCmd-v2_1_0.xsd" />
 	
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />
 	
     
 	<xs:element name="mefClientReg" substitutionGroup="m2m:sg_resource">
diff --git a/v2_1_0/SEC-symmKeyReg-v2_1_0.xsd b/v2_1_0/SEC-symmKeyReg-v2_1_0.xsd
index 4ce96869d1d0fff83b10a35cf2e693a49781fbbc..2bc100ec81d621242a843df4cf9a68b49a9cb188 100644
--- a/v2_1_0/SEC-symmKeyReg-v2_1_0.xsd
+++ b/v2_1_0/SEC-symmKeyReg-v2_1_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="SEC-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="SEC-commonTypes-v2_1_0.xsd" />
 
-	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_13_0.xsd" />
+	<xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v2_15_0.xsd" />