From 083d1bfc9628d5025276ccf7b9a929fadb64aa0c Mon Sep 17 00:00:00 2001
From: wgranzow <wgranzow@qti.qualcomm.com>
Date: Wed, 23 Mar 2016 22:00:19 +0100
Subject: [PATCH] updated schemaLocation attribute values

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

diff --git a/v2_5_0/CDT-AE-v2_5_0.xsd b/v2_5_0/CDT-AE-v2_5_0.xsd
index 567fff9..ddf5108 100644
--- a/v2_5_0/CDT-AE-v2_5_0.xsd
+++ b/v2_5_0/CDT-AE-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-CSEBase-v2_5_0.xsd b/v2_5_0/CDT-CSEBase-v2_5_0.xsd
index 1af5893..2190431 100644
--- a/v2_5_0/CDT-CSEBase-v2_5_0.xsd
+++ b/v2_5_0/CDT-CSEBase-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v2_5_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_5_0.xsd" />
 
 	<xs:element name="CSEBase">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd b/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
index 503edf4..cf1effd 100644
--- a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-accessControlPolicy-v2_5_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-v2_4_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd"/>
 
 	<xs:element name="accessControlPolicy">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd b/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd
index 6706662..d07f7cf 100644
--- a/v2_5_0/CDT-activeCmdhPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-activeCmdhPolicy-v2_5_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-v2_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
 
     <xs:element name="activeCmdhPolicy">
       <xs:complexType>
diff --git a/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd b/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd
index 3526f29..a7961cc 100644
--- a/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-areaNwkDeviceInfo-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd b/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd
index 1b1fcba..87f673f 100644
--- a/v2_5_0/CDT-areaNwkInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-areaNwkInfo-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="areaNwkInfo">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-battery-v2_5_0.xsd b/v2_5_0/CDT-battery-v2_5_0.xsd
index d1c13a1..9d69be7 100644
--- a/v2_5_0/CDT-battery-v2_5_0.xsd
+++ b/v2_5_0/CDT-battery-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="battery">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd b/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd
index 173a44f..d07d9d5 100644
--- a/v2_5_0/CDT-cmdhBuffer-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhBuffer-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhBuffer">
     <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd b/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd
index f074f72..ec29207 100644
--- a/v2_5_0/CDT-cmdhDefEcValue-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhDefEcValue-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue">
     <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd b/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd
index e9c4f48..2ee9811 100644
--- a/v2_5_0/CDT-cmdhDefaults-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhDefaults-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
     <xs:element name="cmdhDefaults">
       <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd b/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd
index 7b21708..7e1bccf 100644
--- a/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhEcDefParamValues-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues">    
     <xs:complexType>     
diff --git a/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd b/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd
index 46ef4e1..cd79c86 100644
--- a/v2_5_0/CDT-cmdhLimits-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhLimits-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhLimits">
     <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd b/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd
index e387acf..f301d29 100644
--- a/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhNetworkAccessRules-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules">
     <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd b/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd
index b5e62ae..e8fc144 100644
--- a/v2_5_0/CDT-cmdhNwAccessRule-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhNwAccessRule-v2_5_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-v2_4_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule">
     <xs:complexType>
diff --git a/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd b/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd
index c99eed8..7a5c63b 100644
--- a/v2_5_0/CDT-cmdhPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-cmdhPolicy-v2_5_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-v2_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
 
     <xs:element name="cmdhPolicy" >
       <xs:complexType>
diff --git a/v2_5_0/CDT-commonTypes-v2_5_0.xsd b/v2_5_0/CDT-commonTypes-v2_5_0.xsd
index 0d5e5c8..0652bde 100644
--- a/v2_5_0/CDT-commonTypes-v2_5_0.xsd
+++ b/v2_5_0/CDT-commonTypes-v2_5_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-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v2_5_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v2_5_0/CDT-container-v2_5_0.xsd b/v2_5_0/CDT-container-v2_5_0.xsd
index a71c3bd..8ee50da 100644
--- a/v2_5_0/CDT-container-v2_5_0.xsd
+++ b/v2_5_0/CDT-container-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="container">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-contentInstance-v2_5_0.xsd b/v2_5_0/CDT-contentInstance-v2_5_0.xsd
index b1aa0ab..4adfd16 100644
--- a/v2_5_0/CDT-contentInstance-v2_5_0.xsd
+++ b/v2_5_0/CDT-contentInstance-v2_5_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-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
 
 	<xs:element name="contentInstance">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-delivery-v2_5_0.xsd b/v2_5_0/CDT-delivery-v2_5_0.xsd
index b5e9c7a..5d92511 100644
--- a/v2_5_0/CDT-delivery-v2_5_0.xsd
+++ b/v2_5_0/CDT-delivery-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 
 	<xs:element name="delivery">
diff --git a/v2_5_0/CDT-deviceCapability-v2_5_0.xsd b/v2_5_0/CDT-deviceCapability-v2_5_0.xsd
index 584fcee..64a5ac6 100644
--- a/v2_5_0/CDT-deviceCapability-v2_5_0.xsd
+++ b/v2_5_0/CDT-deviceCapability-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="deviceCapability">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-deviceInfo-v2_5_0.xsd b/v2_5_0/CDT-deviceInfo-v2_5_0.xsd
index fd2fda8..7239c23 100644
--- a/v2_5_0/CDT-deviceInfo-v2_5_0.xsd
+++ b/v2_5_0/CDT-deviceInfo-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="deviceInfo">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-eventConfig-v2_5_0.xsd b/v2_5_0/CDT-eventConfig-v2_5_0.xsd
index 6f029ba..1a92636 100644
--- a/v2_5_0/CDT-eventConfig-v2_5_0.xsd
+++ b/v2_5_0/CDT-eventConfig-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="eventConfig">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-eventLog-v2_5_0.xsd b/v2_5_0/CDT-eventLog-v2_5_0.xsd
index a620d0c..7817cfc 100644
--- a/v2_5_0/CDT-eventLog-v2_5_0.xsd
+++ b/v2_5_0/CDT-eventLog-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="eventLog">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-execInstance-v2_5_0.xsd b/v2_5_0/CDT-execInstance-v2_5_0.xsd
index efd19f2..e4542fe 100644
--- a/v2_5_0/CDT-execInstance-v2_5_0.xsd
+++ b/v2_5_0/CDT-execInstance-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="execInstance">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-firmware-v2_5_0.xsd b/v2_5_0/CDT-firmware-v2_5_0.xsd
index b314411..2800bf6 100644
--- a/v2_5_0/CDT-firmware-v2_5_0.xsd
+++ b/v2_5_0/CDT-firmware-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="firmware">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-group-v2_5_0.xsd b/v2_5_0/CDT-group-v2_5_0.xsd
index f4b89fb..eec529b 100644
--- a/v2_5_0/CDT-group-v2_5_0.xsd
+++ b/v2_5_0/CDT-group-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="group">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-locationPolicy-v2_5_0.xsd b/v2_5_0/CDT-locationPolicy-v2_5_0.xsd
index 409e444..9d65e97 100644
--- a/v2_5_0/CDT-locationPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-locationPolicy-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="locationPolicy">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd b/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd
index 37deb72..12ad281 100644
--- a/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd
+++ b/v2_5_0/CDT-m2mServiceSubscriptionProfile-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v2_5_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-memory-v2_5_0.xsd b/v2_5_0/CDT-memory-v2_5_0.xsd
index cbe9a47..006027d 100644
--- a/v2_5_0/CDT-memory-v2_5_0.xsd
+++ b/v2_5_0/CDT-memory-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="memory">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd b/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd
index 44c5f10..76599a3 100644
--- a/v2_5_0/CDT-mgmtCmd-v2_5_0.xsd
+++ b/v2_5_0/CDT-mgmtCmd-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v2_5_0.xsd" />
 
 	<xs:element name="mgmtCmd">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-node-v2_5_0.xsd b/v2_5_0/CDT-node-v2_5_0.xsd
index 9507361..2dc8405 100644
--- a/v2_5_0/CDT-node-v2_5_0.xsd
+++ b/v2_5_0/CDT-node-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="node">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-notification-v2_5_0.xsd b/v2_5_0/CDT-notification-v2_5_0.xsd
index 1bed6d6..8d57796 100644
--- a/v2_5_0/CDT-notification-v2_5_0.xsd
+++ b/v2_5_0/CDT-notification-v2_5_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-v2_4_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v2_5_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd b/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
index 7eb7131..b5cbba3 100644
--- a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
+++ b/v2_5_0/CDT-pollingChannel-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="pollingChannel">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-reboot-v2_5_0.xsd b/v2_5_0/CDT-reboot-v2_5_0.xsd
index 84577fc..3e918e5 100644
--- a/v2_5_0/CDT-reboot-v2_5_0.xsd
+++ b/v2_5_0/CDT-reboot-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="reboot">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-remoteCSE-v2_5_0.xsd b/v2_5_0/CDT-remoteCSE-v2_5_0.xsd
index d762cf6..153707f 100644
--- a/v2_5_0/CDT-remoteCSE-v2_5_0.xsd
+++ b/v2_5_0/CDT-remoteCSE-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
 
 	<xs:element name="remoteCSE">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-request-v2_5_0.xsd b/v2_5_0/CDT-request-v2_5_0.xsd
index 7055c2b..c7c1ced 100644
--- a/v2_5_0/CDT-request-v2_5_0.xsd
+++ b/v2_5_0/CDT-request-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="request">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd b/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd
index a8c337d..808dad7 100644
--- a/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd
+++ b/v2_5_0/CDT-requestPrimitive-v2_5_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-v2_4_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd b/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
index adec6e7..947151d 100644
--- a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
+++ b/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
@@ -28,51 +28,51 @@ 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-v2_4_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v2_4_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v2_5_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v2_5_0/CDT-schedule-v2_5_0.xsd b/v2_5_0/CDT-schedule-v2_5_0.xsd
index 5841643..38f0e4e 100644
--- a/v2_5_0/CDT-schedule-v2_5_0.xsd
+++ b/v2_5_0/CDT-schedule-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="schedule">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd b/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd
index c68124c..163bdc4 100644
--- a/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_0.xsd
+++ b/v2_5_0/CDT-serviceSubscribedAppRule-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd b/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd
index 4125575..cf33097 100644
--- a/v2_5_0/CDT-serviceSubscribedNode-v2_5_0.xsd
+++ b/v2_5_0/CDT-serviceSubscribedNode-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-software-v2_5_0.xsd b/v2_5_0/CDT-software-v2_5_0.xsd
index dccdb98..606eff3 100644
--- a/v2_5_0/CDT-software-v2_5_0.xsd
+++ b/v2_5_0/CDT-software-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 	
 	<xs:element name="software">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-statsCollect-v2_5_0.xsd b/v2_5_0/CDT-statsCollect-v2_5_0.xsd
index 11aeb29..c7ea68f 100644
--- a/v2_5_0/CDT-statsCollect-v2_5_0.xsd
+++ b/v2_5_0/CDT-statsCollect-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="statsCollect">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-statsConfig-v2_5_0.xsd b/v2_5_0/CDT-statsConfig-v2_5_0.xsd
index 7715789..56c8fd4 100644
--- a/v2_5_0/CDT-statsConfig-v2_5_0.xsd
+++ b/v2_5_0/CDT-statsConfig-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
 
 	<xs:element name="statsConfig">
 		<xs:complexType>
diff --git a/v2_5_0/CDT-subscription-v2_5_0.xsd b/v2_5_0/CDT-subscription-v2_5_0.xsd
index 7027ea4..b96a468 100644
--- a/v2_5_0/CDT-subscription-v2_5_0.xsd
+++ b/v2_5_0/CDT-subscription-v2_5_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-v2_4_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v2_4_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
 
 	<xs:element name="subscription">
 		<xs:complexType>
-- 
GitLab