From 1601f16880fc3519e962addf023f4f8bb73e6758 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Thu, 4 Jun 2015 18:38:31 +0100
Subject: [PATCH] Converting files to 1.2.0

---
 v1_2_0/CDT-AE-v1_2_0.xsd                      | 12 +++----
 v1_2_0/CDT-CSEBase-v1_2_0.xsd                 | 34 +++++++++----------
 v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd     |  4 +--
 v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd        |  2 +-
 v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd       |  4 +--
 v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd             |  4 +--
 v1_2_0/CDT-battery-v1_2_0.xsd                 |  4 +--
 v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd              |  2 +-
 v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd          |  2 +-
 v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd            |  2 +-
 v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd    |  2 +-
 v1_2_0/CDT-cmdhLimits-v1_2_0.xsd              |  2 +-
 v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd  |  2 +-
 v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd        |  2 +-
 v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd              |  2 +-
 v1_2_0/CDT-commonTypes-v1_2_0.xsd             |  2 +-
 v1_2_0/CDT-container-v1_2_0.xsd               |  6 ++--
 v1_2_0/CDT-contentInstance-v1_2_0.xsd         |  2 +-
 v1_2_0/CDT-delivery-v1_2_0.xsd                |  4 +--
 v1_2_0/CDT-deviceCapability-v1_2_0.xsd        |  4 +--
 v1_2_0/CDT-deviceInfo-v1_2_0.xsd              |  4 +--
 v1_2_0/CDT-eventConfig-v1_2_0.xsd             |  4 +--
 v1_2_0/CDT-eventLog-v1_2_0.xsd                |  4 +--
 v1_2_0/CDT-execInstance-v1_2_0.xsd            |  4 +--
 v1_2_0/CDT-firmware-v1_2_0.xsd                |  4 +--
 v1_2_0/CDT-group-v1_2_0.xsd                   |  4 +--
 v1_2_0/CDT-locationPolicy-v1_2_0.xsd          |  4 +--
 ...T-m2mServiceSubscriptionProfile-v1_2_0.xsd |  6 ++--
 v1_2_0/CDT-memory-v1_2_0.xsd                  |  4 +--
 v1_2_0/CDT-mgmtCmd-v1_2_0.xsd                 |  6 ++--
 v1_2_0/CDT-node-v1_2_0.xsd                    | 28 +++++++--------
 v1_2_0/CDT-notification-v1_2_0.xsd            |  4 +--
 v1_2_0/CDT-pollingChannel-v1_2_0.xsd          |  4 +--
 v1_2_0/CDT-reboot-v1_2_0.xsd                  |  4 +--
 v1_2_0/CDT-remoteCSE-v1_2_0.xsd               | 20 +++++------
 v1_2_0/CDT-request-v1_2_0.xsd                 |  4 +--
 v1_2_0/CDT-requestPrimitive-v1_2_0.xsd        |  2 +-
 v1_2_0/CDT-responsePrimitive-v1_2_0.xsd       |  2 +-
 v1_2_0/CDT-schedule-v1_2_0.xsd                |  4 +--
 .../CDT-serviceSubscribedAppRule-v1_2_0.xsd   |  4 +--
 v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd   |  4 +--
 v1_2_0/CDT-software-v1_2_0.xsd                |  4 +--
 v1_2_0/CDT-statsCollect-v1_2_0.xsd            |  4 +--
 v1_2_0/CDT-statsConfig-v1_2_0.xsd             |  6 ++--
 v1_2_0/CDT-subscription-v1_2_0.xsd            |  4 +--
 45 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/v1_2_0/CDT-AE-v1_2_0.xsd b/v1_2_0/CDT-AE-v1_2_0.xsd
index 0d7b458..ccd7760 100644
--- a/v1_2_0/CDT-AE-v1_2_0.xsd
+++ b/v1_2_0/CDT-AE-v1_2_0.xsd
@@ -26,12 +26,12 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_2_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-CSEBase-v1_2_0.xsd b/v1_2_0/CDT-CSEBase-v1_2_0.xsd
index e8d4a98..af55d14 100644
--- a/v1_2_0/CDT-CSEBase-v1_2_0.xsd
+++ b/v1_2_0/CDT-CSEBase-v1_2_0.xsd
@@ -26,23 +26,23 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_1_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_1_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v1_2_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_2_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd b/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd
index 5b26933..d659192 100644
--- a/v1_2_0/CDT-accessControlPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-accessControlPolicy-v1_2_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd b/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd
index 2498167..ff5fcb4 100644
--- a/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-activeCmdhPolicy-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd b/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd
index 7aace37..03fd841 100644
--- a/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd b/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd
index 24b6219..6581fda 100644
--- a/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-areaNwkInfo-v1_2_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-battery-v1_2_0.xsd b/v1_2_0/CDT-battery-v1_2_0.xsd
index b99d174..280ee56 100644
--- a/v1_2_0/CDT-battery-v1_2_0.xsd
+++ b/v1_2_0/CDT-battery-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd b/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd
index 5addd21..762c8e0 100644
--- a/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhBuffer-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd b/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd
index 8181b5f..19bd0bc 100644
--- a/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhDefEcValue-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd b/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd
index 896521e..51e29d8 100644
--- a/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhDefaults-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd b/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd
index 595c7a6..908fa76 100644
--- a/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhEcDefParamValues-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd b/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd
index 884cf66..b483eac 100644
--- a/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhLimits-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd b/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd
index f94e81e..407ee27 100644
--- a/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhNetworkAccessRules-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd b/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd
index e8986a1..c4ceae1 100644
--- a/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhNwAccessRule-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
   xmlns:m2m="http://www.onem2m.org/xml/protocols"
   elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
   
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd b/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd
index 2f86969..2647b43 100644
--- a/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-commonTypes-v1_2_0.xsd b/v1_2_0/CDT-commonTypes-v1_2_0.xsd
index eb8788d..3027cc1 100644
--- a/v1_2_0/CDT-commonTypes-v1_2_0.xsd
+++ b/v1_2_0/CDT-commonTypes-v1_2_0.xsd
@@ -25,7 +25,7 @@ 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/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-enumerationTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v1_2_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v1_2_0/CDT-container-v1_2_0.xsd b/v1_2_0/CDT-container-v1_2_0.xsd
index 4725d4f..a63f7d4 100644
--- a/v1_2_0/CDT-container-v1_2_0.xsd
+++ b/v1_2_0/CDT-container-v1_2_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-contentInstance-v1_2_0.xsd b/v1_2_0/CDT-contentInstance-v1_2_0.xsd
index 6d89077..cfaf378 100644
--- a/v1_2_0/CDT-contentInstance-v1_2_0.xsd
+++ b/v1_2_0/CDT-contentInstance-v1_2_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:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-delivery-v1_2_0.xsd b/v1_2_0/CDT-delivery-v1_2_0.xsd
index b5abe4a..ab39bcb 100644
--- a/v1_2_0/CDT-delivery-v1_2_0.xsd
+++ b/v1_2_0/CDT-delivery-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v1_2_0/CDT-deviceCapability-v1_2_0.xsd b/v1_2_0/CDT-deviceCapability-v1_2_0.xsd
index bd7f5c4..15179b3 100644
--- a/v1_2_0/CDT-deviceCapability-v1_2_0.xsd
+++ b/v1_2_0/CDT-deviceCapability-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-deviceInfo-v1_2_0.xsd b/v1_2_0/CDT-deviceInfo-v1_2_0.xsd
index f93b78a..eec603e 100644
--- a/v1_2_0/CDT-deviceInfo-v1_2_0.xsd
+++ b/v1_2_0/CDT-deviceInfo-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-eventConfig-v1_2_0.xsd b/v1_2_0/CDT-eventConfig-v1_2_0.xsd
index 9cc7834..1dad89e 100644
--- a/v1_2_0/CDT-eventConfig-v1_2_0.xsd
+++ b/v1_2_0/CDT-eventConfig-v1_2_0.xsd
@@ -26,8 +26,8 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-eventLog-v1_2_0.xsd b/v1_2_0/CDT-eventLog-v1_2_0.xsd
index 9dca355..316310b 100644
--- a/v1_2_0/CDT-eventLog-v1_2_0.xsd
+++ b/v1_2_0/CDT-eventLog-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-execInstance-v1_2_0.xsd b/v1_2_0/CDT-execInstance-v1_2_0.xsd
index 8729a4d..013dd69 100644
--- a/v1_2_0/CDT-execInstance-v1_2_0.xsd
+++ b/v1_2_0/CDT-execInstance-v1_2_0.xsd
@@ -26,8 +26,8 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-firmware-v1_2_0.xsd b/v1_2_0/CDT-firmware-v1_2_0.xsd
index c0b8e68..d1800dd 100644
--- a/v1_2_0/CDT-firmware-v1_2_0.xsd
+++ b/v1_2_0/CDT-firmware-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-group-v1_2_0.xsd b/v1_2_0/CDT-group-v1_2_0.xsd
index c5d20b3..8e84047 100644
--- a/v1_2_0/CDT-group-v1_2_0.xsd
+++ b/v1_2_0/CDT-group-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-locationPolicy-v1_2_0.xsd b/v1_2_0/CDT-locationPolicy-v1_2_0.xsd
index c498b18..7ab9ef0 100644
--- a/v1_2_0/CDT-locationPolicy-v1_2_0.xsd
+++ b/v1_2_0/CDT-locationPolicy-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd b/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd
index 1285331..7c84090 100644
--- a/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd
+++ b/v1_2_0/CDT-m2mServiceSubscriptionProfile-v1_2_0.xsd
@@ -26,9 +26,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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_2_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-memory-v1_2_0.xsd b/v1_2_0/CDT-memory-v1_2_0.xsd
index bc584cd..29380ce 100644
--- a/v1_2_0/CDT-memory-v1_2_0.xsd
+++ b/v1_2_0/CDT-memory-v1_2_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" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd b/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd
index 51a61d1..5297639 100644
--- a/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd
+++ b/v1_2_0/CDT-mgmtCmd-v1_2_0.xsd
@@ -26,9 +26,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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v1_2_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-node-v1_2_0.xsd b/v1_2_0/CDT-node-v1_2_0.xsd
index f607d87..0880e98 100644
--- a/v1_2_0/CDT-node-v1_2_0.xsd
+++ b/v1_2_0/CDT-node-v1_2_0.xsd
@@ -27,20 +27,20 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-notification-v1_2_0.xsd b/v1_2_0/CDT-notification-v1_2_0.xsd
index 0d0b46c..a65ff2b 100644
--- a/v1_2_0/CDT-notification-v1_2_0.xsd
+++ b/v1_2_0/CDT-notification-v1_2_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         targetNamespace="http://www.onem2m.org/xml/protocols"
         xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
         xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_1_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v1_2_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v1_2_0/CDT-pollingChannel-v1_2_0.xsd b/v1_2_0/CDT-pollingChannel-v1_2_0.xsd
index adf6540..24a5bec 100644
--- a/v1_2_0/CDT-pollingChannel-v1_2_0.xsd
+++ b/v1_2_0/CDT-pollingChannel-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-reboot-v1_2_0.xsd b/v1_2_0/CDT-reboot-v1_2_0.xsd
index e1adbb1..4d0d45f 100644
--- a/v1_2_0/CDT-reboot-v1_2_0.xsd
+++ b/v1_2_0/CDT-reboot-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-remoteCSE-v1_2_0.xsd b/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
index ea2ebb0..0b181ed 100644
--- a/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
+++ b/v1_2_0/CDT-remoteCSE-v1_2_0.xsd
@@ -26,17 +26,17 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
 
-	<xs:include schemaLocation="CDT-AE-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v1_2_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-request-v1_2_0.xsd b/v1_2_0/CDT-request-v1_2_0.xsd
index fc9448c..7d853ab 100644
--- a/v1_2_0/CDT-request-v1_2_0.xsd
+++ b/v1_2_0/CDT-request-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd b/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
index 9d845ab..478700d 100644
--- a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-    <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd b/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
index 40307ce..4f9fd85 100644
--- a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
       xmlns:m2m="http://www.onem2m.org/xml/protocols"
       elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
 
-  <xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" /> 
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v1_2_0/CDT-schedule-v1_2_0.xsd b/v1_2_0/CDT-schedule-v1_2_0.xsd
index 4f3f8d9..a0ac223 100644
--- a/v1_2_0/CDT-schedule-v1_2_0.xsd
+++ b/v1_2_0/CDT-schedule-v1_2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd b/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd
index 8154f3c..0b79394 100644
--- a/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd
+++ b/v1_2_0/CDT-serviceSubscribedAppRule-v1_2_0.xsd
@@ -26,8 +26,8 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd b/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd
index 450c831..eba0487 100644
--- a/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd
+++ b/v1_2_0/CDT-serviceSubscribedNode-v1_2_0.xsd
@@ -26,8 +26,8 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-software-v1_2_0.xsd b/v1_2_0/CDT-software-v1_2_0.xsd
index c1901cf..9d191b8 100644
--- a/v1_2_0/CDT-software-v1_2_0.xsd
+++ b/v1_2_0/CDT-software-v1_2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-statsCollect-v1_2_0.xsd b/v1_2_0/CDT-statsCollect-v1_2_0.xsd
index 3e2b734..2f94d69 100644
--- a/v1_2_0/CDT-statsCollect-v1_2_0.xsd
+++ b/v1_2_0/CDT-statsCollect-v1_2_0.xsd
@@ -26,8 +26,8 @@ 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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-statsConfig-v1_2_0.xsd b/v1_2_0/CDT-statsConfig-v1_2_0.xsd
index e3607ab..60b1b97 100644
--- a/v1_2_0/CDT-statsConfig-v1_2_0.xsd
+++ b/v1_2_0/CDT-statsConfig-v1_2_0.xsd
@@ -26,9 +26,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="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v1_2_0/CDT-subscription-v1_2_0.xsd b/v1_2_0/CDT-subscription-v1_2_0.xsd
index fdf89c9..103597c 100644
--- a/v1_2_0/CDT-subscription-v1_2_0.xsd
+++ b/v1_2_0/CDT-subscription-v1_2_0.xsd
@@ -27,8 +27,8 @@ 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/protocols"
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_1_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_1_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab