From 9fd20b50179daedd997f055a0b81580da3019af7 Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Mon, 10 Aug 2015 21:06:54 +0200
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_0_0/CDT-AE-v2_0_0.xsd b/v2_0_0/CDT-AE-v2_0_0.xsd
index 7056edc..744a948 100644
--- a/v2_0_0/CDT-AE-v2_0_0.xsd
+++ b/v2_0_0/CDT-AE-v2_0_0.xsd
@@ -26,13 +26,13 @@ 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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-CSEBase-v2_0_0.xsd b/v2_0_0/CDT-CSEBase-v2_0_0.xsd
index 92b0bcc..129e96c 100644
--- a/v2_0_0/CDT-CSEBase-v2_0_0.xsd
+++ b/v2_0_0/CDT-CSEBase-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_3_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_3_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_0_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_0_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd b/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd
index 4b7fb26..b93af98 100644
--- a/v2_0_0/CDT-accessControlPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-accessControlPolicy-v2_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:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd b/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd
index da75e5e..8d6fe6d 100644
--- a/v2_0_0/CDT-activeCmdhPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-activeCmdhPolicy-v2_0_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd b/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd
index 14d5199..43a8804 100644
--- a/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-areaNwkDeviceInfo-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd b/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd
index f0861c1..ddbacf9 100644
--- a/v2_0_0/CDT-areaNwkInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-areaNwkInfo-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-battery-v2_0_0.xsd b/v2_0_0/CDT-battery-v2_0_0.xsd
index cec9f92..dfa961f 100644
--- a/v2_0_0/CDT-battery-v2_0_0.xsd
+++ b/v2_0_0/CDT-battery-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd b/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd
index e2613af..e1ae430 100644
--- a/v2_0_0/CDT-cmdhBuffer-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhBuffer-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd b/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd
index db5805a..d48706c 100644
--- a/v2_0_0/CDT-cmdhDefEcValue-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhDefEcValue-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd b/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd
index d4915e8..f262ef1 100644
--- a/v2_0_0/CDT-cmdhDefaults-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhDefaults-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd b/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd
index c10fe1f..ff140d3 100644
--- a/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhEcDefParamValues-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd b/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd
index deeac6a..faf86b7 100644
--- a/v2_0_0/CDT-cmdhLimits-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhLimits-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd b/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd
index 37fa67e..afffc46 100644
--- a/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhNetworkAccessRules-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd b/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd
index b4f02bd..1384086 100644
--- a/v2_0_0/CDT-cmdhNwAccessRule-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhNwAccessRule-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd b/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd
index 2e8967c..bcce2f1 100644
--- a/v2_0_0/CDT-cmdhPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-cmdhPolicy-v2_0_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_0_0/CDT-commonTypes-v2_0_0.xsd b/v2_0_0/CDT-commonTypes-v2_0_0.xsd
index 4009ecf..d3ece9a 100644
--- a/v2_0_0/CDT-commonTypes-v2_0_0.xsd
+++ b/v2_0_0/CDT-commonTypes-v2_0_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_0_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_0_0/CDT-container-v2_0_0.xsd b/v2_0_0/CDT-container-v2_0_0.xsd
index 329340a..0bf19a5 100644
--- a/v2_0_0/CDT-container-v2_0_0.xsd
+++ b/v2_0_0/CDT-container-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-contentInstance-v2_0_0.xsd b/v2_0_0/CDT-contentInstance-v2_0_0.xsd
index a4a3e36..0bd49c5 100644
--- a/v2_0_0/CDT-contentInstance-v2_0_0.xsd
+++ b/v2_0_0/CDT-contentInstance-v2_0_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_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-delivery-v2_0_0.xsd b/v2_0_0/CDT-delivery-v2_0_0.xsd
index ebc9c8a..a370310 100644
--- a/v2_0_0/CDT-delivery-v2_0_0.xsd
+++ b/v2_0_0/CDT-delivery-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_0_0/CDT-deviceCapability-v2_0_0.xsd b/v2_0_0/CDT-deviceCapability-v2_0_0.xsd
index bfaa5a8..64a68d1 100644
--- a/v2_0_0/CDT-deviceCapability-v2_0_0.xsd
+++ b/v2_0_0/CDT-deviceCapability-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-deviceInfo-v2_0_0.xsd b/v2_0_0/CDT-deviceInfo-v2_0_0.xsd
index a8b2f71..282159e 100644
--- a/v2_0_0/CDT-deviceInfo-v2_0_0.xsd
+++ b/v2_0_0/CDT-deviceInfo-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-eventConfig-v2_0_0.xsd b/v2_0_0/CDT-eventConfig-v2_0_0.xsd
index 1c6274e..6cf3471 100644
--- a/v2_0_0/CDT-eventConfig-v2_0_0.xsd
+++ b/v2_0_0/CDT-eventConfig-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-eventLog-v2_0_0.xsd b/v2_0_0/CDT-eventLog-v2_0_0.xsd
index 5ccb022..63029b5 100644
--- a/v2_0_0/CDT-eventLog-v2_0_0.xsd
+++ b/v2_0_0/CDT-eventLog-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-execInstance-v2_0_0.xsd b/v2_0_0/CDT-execInstance-v2_0_0.xsd
index 45f30d8..7f0d9fe 100644
--- a/v2_0_0/CDT-execInstance-v2_0_0.xsd
+++ b/v2_0_0/CDT-execInstance-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-firmware-v2_0_0.xsd b/v2_0_0/CDT-firmware-v2_0_0.xsd
index 2a3409d..946aef2 100644
--- a/v2_0_0/CDT-firmware-v2_0_0.xsd
+++ b/v2_0_0/CDT-firmware-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-group-v2_0_0.xsd b/v2_0_0/CDT-group-v2_0_0.xsd
index 70adc8f..6cb5797 100644
--- a/v2_0_0/CDT-group-v2_0_0.xsd
+++ b/v2_0_0/CDT-group-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-locationPolicy-v2_0_0.xsd b/v2_0_0/CDT-locationPolicy-v2_0_0.xsd
index 51997fd..d2f17f6 100644
--- a/v2_0_0/CDT-locationPolicy-v2_0_0.xsd
+++ b/v2_0_0/CDT-locationPolicy-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd b/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd
index 3be2065..9c37282 100644
--- a/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_0.xsd
+++ b/v2_0_0/CDT-m2mServiceSubscriptionProfile-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_0_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-memory-v2_0_0.xsd b/v2_0_0/CDT-memory-v2_0_0.xsd
index e4ad7dd..7ebcdc0 100644
--- a/v2_0_0/CDT-memory-v2_0_0.xsd
+++ b/v2_0_0/CDT-memory-v2_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" elementFormDefault="unqualified" attributeFormDefault="unqualified"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd b/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd
index 95fd009..c637adc 100644
--- a/v2_0_0/CDT-mgmtCmd-v2_0_0.xsd
+++ b/v2_0_0/CDT-mgmtCmd-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_0_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-node-v2_0_0.xsd b/v2_0_0/CDT-node-v2_0_0.xsd
index 321c4d0..805c183 100644
--- a/v2_0_0/CDT-node-v2_0_0.xsd
+++ b/v2_0_0/CDT-node-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-notification-v2_0_0.xsd b/v2_0_0/CDT-notification-v2_0_0.xsd
index b30dc25..5ccfc52 100644
--- a/v2_0_0/CDT-notification-v2_0_0.xsd
+++ b/v2_0_0/CDT-notification-v2_0_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_3_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_0_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_0_0/CDT-pollingChannel-v2_0_0.xsd b/v2_0_0/CDT-pollingChannel-v2_0_0.xsd
index 26a9a20..5c7bf01 100644
--- a/v2_0_0/CDT-pollingChannel-v2_0_0.xsd
+++ b/v2_0_0/CDT-pollingChannel-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-reboot-v2_0_0.xsd b/v2_0_0/CDT-reboot-v2_0_0.xsd
index e5d03c9..a638790 100644
--- a/v2_0_0/CDT-reboot-v2_0_0.xsd
+++ b/v2_0_0/CDT-reboot-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-remoteCSE-v2_0_0.xsd b/v2_0_0/CDT-remoteCSE-v2_0_0.xsd
index 0bb024a..ec6911c 100644
--- a/v2_0_0/CDT-remoteCSE-v2_0_0.xsd
+++ b/v2_0_0/CDT-remoteCSE-v2_0_0.xsd
@@ -26,15 +26,15 @@ 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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_0_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-request-v2_0_0.xsd b/v2_0_0/CDT-request-v2_0_0.xsd
index 9d005b3..022693d 100644
--- a/v2_0_0/CDT-request-v2_0_0.xsd
+++ b/v2_0_0/CDT-request-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd b/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd
index 25c6639..d58dd5b 100644
--- a/v2_0_0/CDT-requestPrimitive-v2_0_0.xsd
+++ b/v2_0_0/CDT-requestPrimitive-v2_0_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_3_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd b/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd
index 9aa98c9..590bd2f 100644
--- a/v2_0_0/CDT-responsePrimitive-v2_0_0.xsd
+++ b/v2_0_0/CDT-responsePrimitive-v2_0_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_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" /> 
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_0_0/CDT-schedule-v2_0_0.xsd b/v2_0_0/CDT-schedule-v2_0_0.xsd
index a7eefd8..c07e870 100644
--- a/v2_0_0/CDT-schedule-v2_0_0.xsd
+++ b/v2_0_0/CDT-schedule-v2_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:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd b/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd
index 2fdbf3c..d7321a1 100644
--- a/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_0.xsd
+++ b/v2_0_0/CDT-serviceSubscribedAppRule-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd b/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd
index 377fb50..aebd02b 100644
--- a/v2_0_0/CDT-serviceSubscribedNode-v2_0_0.xsd
+++ b/v2_0_0/CDT-serviceSubscribedNode-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-software-v2_0_0.xsd b/v2_0_0/CDT-software-v2_0_0.xsd
index 00189b3..ffda8b2 100644
--- a/v2_0_0/CDT-software-v2_0_0.xsd
+++ b/v2_0_0/CDT-software-v2_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" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-statsCollect-v2_0_0.xsd b/v2_0_0/CDT-statsCollect-v2_0_0.xsd
index 736d3ac..362dd80 100644
--- a/v2_0_0/CDT-statsCollect-v2_0_0.xsd
+++ b/v2_0_0/CDT-statsCollect-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-statsConfig-v2_0_0.xsd b/v2_0_0/CDT-statsConfig-v2_0_0.xsd
index 8c7f02d..160cb20 100644
--- a/v2_0_0/CDT-statsConfig-v2_0_0.xsd
+++ b/v2_0_0/CDT-statsConfig-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_3_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_0_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_0_0/CDT-subscription-v2_0_0.xsd b/v2_0_0/CDT-subscription-v2_0_0.xsd
index c487f51..adc445e 100644
--- a/v2_0_0/CDT-subscription-v2_0_0.xsd
+++ b/v2_0_0/CDT-subscription-v2_0_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_3_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_3_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_0_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_0_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab