diff --git a/v3_3_0/CDT-AE-v3_3_0.xsd b/v3_3_0/CDT-AE-v3_3_0.xsd
index d9793be3c63f22bb03c37fbd181dfdeef4546336..902afd1f73fbd2faa7eabc0f59dcf6c48e7f5257 100644
--- a/v3_3_0/CDT-AE-v3_3_0.xsd
+++ b/v3_3_0/CDT-AE-v3_3_0.xsd
@@ -26,16 +26,16 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
 	
 	<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-CSEBase-v3_3_0.xsd b/v3_3_0/CDT-CSEBase-v3_3_0.xsd
index 86eeb6d002098ce3f060b0efec636e832acbc0c5..ace9429c5c3982081a33c54882cf9e1493b58c08 100644
--- a/v3_3_0/CDT-CSEBase-v3_3_0.xsd
+++ b/v3_3_0/CDT-CSEBase-v3_3_0.xsd
@@ -26,26 +26,26 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v3_2_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-role-v3_2_0.xsd" />
-    <xs:include schemaLocation="CDT-token-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />  
+    <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
+    <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
     
 	<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd b/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd
index d5656d87c1f5ab232db52c268c58d6e9c277c2c6..da10986d5d3c2a25d50202742070bc3ca6629ad8 100644
--- a/v3_3_0/CDT-accessControlPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-accessControlPolicy-v3_3_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-v3_2_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd"/>
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd"/>
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd"/>
 
 	<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd b/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd
index 620f1fc6f316fe92f701ed31402d223d5d1eb23c..19b1c7b1c0e1b7ec0faed44811a4431d5880bb3a 100644
--- a/v3_3_0/CDT-activeCmdhPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-activeCmdhPolicy-v3_3_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-v3_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
   <xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-allJoynApp-v3_3_0.xsd b/v3_3_0/CDT-allJoynApp-v3_3_0.xsd
index 8adeb638dbe1d0f51a8c6b7d17010dc467412bb5..18ceda819c211bd991827ea2e0fd8ce37b91c8fe 100644
--- a/v3_3_0/CDT-allJoynApp-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynApp-v3_3_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynSvcObject-v3_3_0.xsd" />
 	
 	<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd b/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd
index 45ac7a083fbe0bd47ea73f3016efd6a211a7d4f4..6d890b514cd5e94e9d39e6fcf18a62fce43924eb 100644
--- a/v3_3_0/CDT-allJoynInterface-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynInterface-v3_3_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-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethod-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynProperty-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethod-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynProperty-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
 	
 	
 	<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd b/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd
index 67a76c7668beb8b96a861e900b43ab6ff1a49d9a..3f6caf7017ab39fc5e47d188db76afd3a61ff550 100644
--- a/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynMethod-v3_3_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynMethodCall-v3_3_0.xsd" />
 
 	
 	<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd b/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd
index 97c2ea6f7509d533503494c62f0594b0313f873f..eefaa72aeb2a61c1f79b97bd7bb0c49c5f89282a 100644
--- a/v3_3_0/CDT-allJoynMethodCall-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynMethodCall-v3_3_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-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd b/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd
index 1563689c142d56232e22d2f59538a9b08fbe4fdd..12eed125c26813c4f402c969371d57b226a47564 100644
--- a/v3_3_0/CDT-allJoynProperty-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynProperty-v3_3_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-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd b/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd
index 199869729230dd6808414f51342e13533d068de6..977815290370a0e615fd187756c0cb71ba5d1fb2 100644
--- a/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd
+++ b/v3_3_0/CDT-allJoynSvcObject-v3_3_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynInterface-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynInterface-v3_3_0.xsd" />
 	
 	<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd b/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd
index 0144f80ad8aaa5a213a74b43e55a42a4a9938cee..713544a936d4fc7111ef558bb32c7be70b19277f 100644
--- a/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-areaNwkDeviceInfo-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd b/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd
index 724311929d9fe16d749c7bf8b877eb6a983b55ea..49cf6c90441b4600a0e671bf06d2bdc778acd4c3 100644
--- a/v3_3_0/CDT-areaNwkInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-areaNwkInfo-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-battery-v3_3_0.xsd b/v3_3_0/CDT-battery-v3_3_0.xsd
index b269020de1ee3bc15d3e4027acedba005e386a51..6d1ee6d983d24e3e5ca2a2df0cd462e1950fdf91 100644
--- a/v3_3_0/CDT-battery-v3_3_0.xsd
+++ b/v3_3_0/CDT-battery-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd b/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd
index c5de99b89d9c109800c3f94a84da36bedf370ccf..5c6b3980c57ae7777975111e04f8a1c055e6baab 100644
--- a/v3_3_0/CDT-cmdhBuffer-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhBuffer-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd b/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd
index efc4a4727b255b82c0a5afc884ef180e2fc962ed..1a6471767ee8d145e645c700da0e7fa4d6ee4c2c 100644
--- a/v3_3_0/CDT-cmdhDefEcValue-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhDefEcValue-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd b/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd
index 9154b5c657cc0f4b7807af679f2781d813540006..d4a02e6493ed9a4eea39f83f330c2fe74c6a1ec3 100644
--- a/v3_3_0/CDT-cmdhDefaults-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhDefaults-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd b/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd
index 9a57d3d4d30cc7c0ce411edd995c36bf60b99d7d..12b27e1447348713735eb98f21817bbdacba07d0 100644
--- a/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhEcDefParamValues-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">    
     <xs:complexType>     
diff --git a/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd b/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd
index ed9c984c611e1447a97bbe88b1b1306cab28c3a2..34f7cdbef4a462ca6d20c280f8ed5a761b6a982a 100644
--- a/v3_3_0/CDT-cmdhLimits-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhLimits-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd b/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd
index 75265c5706f0a1ba7efd6c03c5fc813cc4f73f9c..ea0a73e611bdfe450530955dbec7cfe829c3b062 100644
--- a/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhNetworkAccessRules-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd b/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd
index 5fdadea370eb6b3ebc09c51986383e54dbdfb543..0506fa5df14b9fb61b850172ec594e30a9bb304c 100644
--- a/v3_3_0/CDT-cmdhNwAccessRule-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhNwAccessRule-v3_3_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-v3_2_0.xsd" /> 
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
   
   <xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
     <xs:complexType>
diff --git a/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd b/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd
index 581578ade597ea5e7ca0b1aa05cd98f3df926301..e1059ac4f1cc7d72e3aa7f9d43332261e9a101b0 100644
--- a/v3_3_0/CDT-cmdhPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-cmdhPolicy-v3_3_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-v3_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
   <xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
       <xs:complexType>
diff --git a/v3_3_0/CDT-commonTypes-v3_3_0.xsd b/v3_3_0/CDT-commonTypes-v3_3_0.xsd
index 6c3ad1a1f3008691ab11450d1f468138cc8ffc5d..40df85412eeaf90ca306255134786c16ac2f516d 100644
--- a/v3_3_0/CDT-commonTypes-v3_3_0.xsd
+++ b/v3_3_0/CDT-commonTypes-v3_3_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-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-enumerationTypes-v3_3_0.xsd" />
 
 	<!--********************** -->
 	<!-- oneM2M Simple Types   -->
diff --git a/v3_3_0/CDT-container-v3_3_0.xsd b/v3_3_0/CDT-container-v3_3_0.xsd
index b68ee9ce4ad3928c25571c09a7becab41c02373f..04cdbf4027e46697fc31cd8ecaf550f63fdfd658 100644
--- a/v3_3_0/CDT-container-v3_3_0.xsd
+++ b/v3_3_0/CDT-container-v3_3_0.xsd
@@ -26,10 +26,10 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
 	
 	
 	<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_3_0/CDT-contentInstance-v3_3_0.xsd b/v3_3_0/CDT-contentInstance-v3_3_0.xsd
index 0503ba8fcc27b2402482c8e7bf0a4b254076d0a4..4fd66b51f864b803d46954c2bfe16707606e1319 100644
--- a/v3_3_0/CDT-contentInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-contentInstance-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
 
 	<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-delivery-v3_3_0.xsd b/v3_3_0/CDT-delivery-v3_3_0.xsd
index db57b7a5f862c4e7cc1ac5db485e3187933c52df..e37ba0940b2723a524442f067c821230d6392d71 100644
--- a/v3_3_0/CDT-delivery-v3_3_0.xsd
+++ b/v3_3_0/CDT-delivery-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 
 	<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v3_3_0/CDT-deviceCapability-v3_3_0.xsd b/v3_3_0/CDT-deviceCapability-v3_3_0.xsd
index f347318c09cb7317a8c2d3b16df523139ded31a7..c4a1b0b892e36573de0bcdcbdcc66d8a986562e2 100644
--- a/v3_3_0/CDT-deviceCapability-v3_3_0.xsd
+++ b/v3_3_0/CDT-deviceCapability-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-deviceInfo-v3_3_0.xsd b/v3_3_0/CDT-deviceInfo-v3_3_0.xsd
index 16f708b32aeb4a3f24a653657aa04b9a43febc01..85597f9e32bbf4c260a5536e117b295ab4ec2ea0 100644
--- a/v3_3_0/CDT-deviceInfo-v3_3_0.xsd
+++ b/v3_3_0/CDT-deviceInfo-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd b/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd
index ecc370a0b05d8b93b98c8d9ccb6bb40702b8727a..4945e5e646e7916fbebc3453bb7e617d16bd1b72 100644
--- a/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd
+++ b/v3_3_0/CDT-dynamicAuthorizationConsultation-v3_3_0.xsd
@@ -26,7 +26,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-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
 
 	<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-eventConfig-v3_3_0.xsd b/v3_3_0/CDT-eventConfig-v3_3_0.xsd
index 681ff4b9cb3a7693fd6cc0032cb28e76e7cb657c..c74038376117836004ff775d684dcc9a1b104868 100644
--- a/v3_3_0/CDT-eventConfig-v3_3_0.xsd
+++ b/v3_3_0/CDT-eventConfig-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-eventLog-v3_3_0.xsd b/v3_3_0/CDT-eventLog-v3_3_0.xsd
index 40242199aa5992df12ddcd1b08824fd30d2aa5cb..867ba5139512e860f890d0f144b93c48dc19b8f5 100644
--- a/v3_3_0/CDT-eventLog-v3_3_0.xsd
+++ b/v3_3_0/CDT-eventLog-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-execInstance-v3_3_0.xsd b/v3_3_0/CDT-execInstance-v3_3_0.xsd
index c74d22ea72fe55c633b0056e4151ec3d34e925f4..04fad98377caf9abfb619129e5078c47540e1840 100644
--- a/v3_3_0/CDT-execInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-execInstance-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-firmware-v3_3_0.xsd b/v3_3_0/CDT-firmware-v3_3_0.xsd
index 118cce8419f31ee73cea0a2c05143e83be54087f..3f1ca748ec8524766f358cbf0f943e7da63212a7 100644
--- a/v3_3_0/CDT-firmware-v3_3_0.xsd
+++ b/v3_3_0/CDT-firmware-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd b/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd
index 7a72d2e9f38a8bf98d111d39caabef1d14d78860..09bbe136658bac558ab76b5772dfe4bc9cd5fc79 100644
--- a/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-genericInterworkingOperationInstance-v3_3_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-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd b/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd
index 1c67f6197aa62b59397237bf412149f359713689..053a095b946298e792e91fe5b4aa639d5caa912d 100644
--- a/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd
+++ b/v3_3_0/CDT-genericInterworkingService-v3_3_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v3_3_0.xsd" />
 	
 	<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-group-v3_3_0.xsd b/v3_3_0/CDT-group-v3_3_0.xsd
index 17361e170450c465fd332b67795d4aba325562b9..52d62de684def54e19202c2f27033c66aa6be4a3 100644
--- a/v3_3_0/CDT-group-v3_3_0.xsd
+++ b/v3_3_0/CDT-group-v3_3_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
 
 	<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-locationPolicy-v3_3_0.xsd b/v3_3_0/CDT-locationPolicy-v3_3_0.xsd
index 0ffac72bbecfacc0c4f91d97738cf8e87cd44700..4c817bba5cbe18c38f950995f712f2d6444c1097 100644
--- a/v3_3_0/CDT-locationPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-locationPolicy-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd b/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd
index ebceb5d449e18dbc9ead8172d17175f8b763bf9a..067966f6241465e932e722fe7244e9368c03d588 100644
--- a/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd
+++ b/v3_3_0/CDT-m2mServiceSubscriptionProfile-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
 
 	<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-memory-v3_3_0.xsd b/v3_3_0/CDT-memory-v3_3_0.xsd
index c64af9c34f3ecdf8a4308c72c105870ec0a7c991..5c47de0845094d61cda38fa3d604f05645ea6f69 100644
--- a/v3_3_0/CDT-memory-v3_3_0.xsd
+++ b/v3_3_0/CDT-memory-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd b/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd
index 9e6671e82a78647987dc678a79e3529e84aeeb85..90fc2cff47c543958e06e0a93c8dd71646661724 100644
--- a/v3_3_0/CDT-mgmtCmd-v3_3_0.xsd
+++ b/v3_3_0/CDT-mgmtCmd-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
 
 	<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-node-v3_3_0.xsd b/v3_3_0/CDT-node-v3_3_0.xsd
index fe7c6a2c41e0bebb90bbe7341f0d9bb726b1517e..4589343dbe01b8c2d4114c32e75a993b74789cd1 100644
--- a/v3_3_0/CDT-node-v3_3_0.xsd
+++ b/v3_3_0/CDT-node-v3_3_0.xsd
@@ -27,22 +27,22 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-trafficPattern-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-trafficPattern-v3_3_0.xsd" />
 
 	<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-notification-v3_3_0.xsd b/v3_3_0/CDT-notification-v3_3_0.xsd
index 35976708806f4e3ea63672310104857ec2e634fd..0ae6d1c556ad9d27162c977bf6992e99e7fd8454 100644
--- a/v3_3_0/CDT-notification-v3_3_0.xsd
+++ b/v3_3_0/CDT-notification-v3_3_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-v3_2_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v3_2_0.xsd"/>
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd"/>
+    <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd"/>
 
 
         <xs:element name="notification" type="m2m:notification" />      
diff --git a/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd b/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd
index b45fac61683d9fdf3e735bdced44bf5fc4d53843..bbb2b5d3a5eb6860c4d40b2a0d6a51deb96b1218 100644
--- a/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd
+++ b/v3_3_0/CDT-notificationTargetMgmtPolicyRef-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd b/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd
index 896e695d0d5b2cdda76473586508aad3482d3ac1..5df81c02d1c9adbbe7ce9e0a3f59d82f88a69215 100644
--- a/v3_3_0/CDT-notificationTargetPolicy-v3_3_0.xsd
+++ b/v3_3_0/CDT-notificationTargetPolicy-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-policyDeletionRules-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-policyDeletionRules-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd b/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd
index e1fa46104b156492cfe7eb5e166a4074e27d3810..5714709932c2663766d34911ea7c5ccae96a986a 100644
--- a/v3_3_0/CDT-policyDeletionRules-v3_3_0.xsd
+++ b/v3_3_0/CDT-policyDeletionRules-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-pollingChannel-v3_3_0.xsd b/v3_3_0/CDT-pollingChannel-v3_3_0.xsd
index a25a7a35aa196f3e2e335dd1abb48f99e9280aa4..5a0463a0fac3c1ff5783ff5499aae40a50a143f0 100644
--- a/v3_3_0/CDT-pollingChannel-v3_3_0.xsd
+++ b/v3_3_0/CDT-pollingChannel-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-reboot-v3_3_0.xsd b/v3_3_0/CDT-reboot-v3_3_0.xsd
index 81b47e9f242a9eca8a925512dc10e878a1cbdd07..9e6fe78dc018b23b391c64589a1928bd3b254037 100644
--- a/v3_3_0/CDT-reboot-v3_3_0.xsd
+++ b/v3_3_0/CDT-reboot-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-remoteCSE-v3_3_0.xsd b/v3_3_0/CDT-remoteCSE-v3_3_0.xsd
index 8a93aa38f5a6b04b51a9a29b168f8d616840c696..ab9ebde8fd853f027ef4e31e0a070705f1f83735 100644
--- a/v3_3_0/CDT-remoteCSE-v3_3_0.xsd
+++ b/v3_3_0/CDT-remoteCSE-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
 
 	<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-request-v3_3_0.xsd b/v3_3_0/CDT-request-v3_3_0.xsd
index 8f843fdde9af50981e688c776f148ffa77d5cda0..667186634b6833b72fb64b3e2ab507e5fda87225 100644
--- a/v3_3_0/CDT-request-v3_3_0.xsd
+++ b/v3_3_0/CDT-request-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd b/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd
index 41f8b174976873ec89b2b20ac980c8b9262e3fd5..132aef5b3422f0b91f6cb76fa2da5a8e1fdfef95 100644
--- a/v3_3_0/CDT-requestPrimitive-v3_3_0.xsd
+++ b/v3_3_0/CDT-requestPrimitive-v3_3_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-v3_2_0.xsd" /> 
+    <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
 
     <xs:element name="requestPrimitive" >
       <xs:complexType>
diff --git a/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd b/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd
index 4c93d1af397d3e6f2cdcad7438b4c6685441fde5..4e99560715e11eedc0cd74e068dc51310c483632 100644
--- a/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd
+++ b/v3_3_0/CDT-responsePrimitive-v3_3_0.xsd
@@ -28,55 +28,55 @@ 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-v3_2_0.xsd" /> 
-  <xs:include schemaLocation="CDT-accessControlPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-AE-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-areaNwkInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-battery-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhBuffer-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefaults-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhLimits-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-cmdhPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-container-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-contentInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-CSEBase-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-delivery-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceCapability-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-deviceInfo-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventConfig-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-eventLog-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-execInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-firmware-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-group-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-locationPolicy-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-memory-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-mgmtCmd-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-node-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-notification-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-pollingChannel-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-reboot-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-remoteCSE-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-request-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-requestPrimitive-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-responsePrimitive-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-software-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsCollect-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-statsConfig-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeries-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-role-v3_2_0.xsd" />
-  <xs:include schemaLocation="CDT-token-v3_2_0.xsd" />
+  <xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" /> 
+  <xs:include schemaLocation="CDT-accessControlPolicy-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-AE-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-areaNwkInfo-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-battery-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhBuffer-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefaults-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhDefEcValue-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhLimits-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhNwAccessRule-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-cmdhPolicy-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-container-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-contentInstance-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-CSEBase-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-delivery-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceCapability-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-deviceInfo-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-eventLog-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-execInstance-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-firmware-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-group-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-locationPolicy-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-memory-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-mgmtCmd-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-node-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-notification-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-pollingChannel-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-reboot-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-remoteCSE-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-request-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-requestPrimitive-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-responsePrimitive-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-software-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsCollect-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-statsConfig-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeries-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-role-v3_3_0.xsd" />
+  <xs:include schemaLocation="CDT-token-v3_3_0.xsd" />
 
   <xs:element name="responsePrimitive" >
       <xs:complexType>
diff --git a/v3_3_0/CDT-role-v3_3_0.xsd b/v3_3_0/CDT-role-v3_3_0.xsd
index c8be01b7a30f7ece658b34b4917a2413912a7b1c..d874d1f902a92f6540a7e35967fbdc70cbb045f7 100644
--- a/v3_3_0/CDT-role-v3_3_0.xsd
+++ b/v3_3_0/CDT-role-v3_3_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-schedule-v3_3_0.xsd b/v3_3_0/CDT-schedule-v3_3_0.xsd
index 53e1cba2271df52f15c88cd7279bd5b1a6fac5d4..d9feab714f124d2f07e6d83645c89037120f17ad 100644
--- a/v3_3_0/CDT-schedule-v3_3_0.xsd
+++ b/v3_3_0/CDT-schedule-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd b/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd
index dca67f46445d1aea48a916b19164a0e912e67a61..0982325685129f99116bb00be61920db0374a1a6 100644
--- a/v3_3_0/CDT-semanticDescriptor-v3_3_0.xsd
+++ b/v3_3_0/CDT-semanticDescriptor-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd b/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd
index abe851a922996927381121e3f6d0da796ff3ac70..d37b64ac0854a7d8ce25bf9a0e5206e19bf9f671 100644
--- a/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_0.xsd
+++ b/v3_3_0/CDT-serviceSubscribedAppRule-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd b/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd
index 3c2cb158a40eb0b23ebb47b09ff7c220fe196b2d..e16598b4584c803bf71d5e985c12ace2501afaa6 100644
--- a/v3_3_0/CDT-serviceSubscribedNode-v3_3_0.xsd
+++ b/v3_3_0/CDT-serviceSubscribedNode-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-software-v3_3_0.xsd b/v3_3_0/CDT-software-v3_3_0.xsd
index 6e1f503385522337f984caeea6dde204c42fd1f8..acd62d0264bd4c7c6fe3f17e248eaf538f847a20 100644
--- a/v3_3_0/CDT-software-v3_3_0.xsd
+++ b/v3_3_0/CDT-software-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-statsCollect-v3_3_0.xsd b/v3_3_0/CDT-statsCollect-v3_3_0.xsd
index 401e551be0246184a260dfcc0f3b83e3ee59f0b9..442d51f0c37bd34f95d7abe7340acbd7f5ca5399 100644
--- a/v3_3_0/CDT-statsCollect-v3_3_0.xsd
+++ b/v3_3_0/CDT-statsCollect-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-statsConfig-v3_3_0.xsd b/v3_3_0/CDT-statsConfig-v3_3_0.xsd
index 38547edf53e0dba1612d42489107ed87a351841b..a24609ba1b423e1f66a6b42bf4abd6ad97afb68d 100644
--- a/v3_3_0/CDT-statsConfig-v3_3_0.xsd
+++ b/v3_3_0/CDT-statsConfig-v3_3_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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-eventConfig-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-subscription-v3_3_0.xsd b/v3_3_0/CDT-subscription-v3_3_0.xsd
index 2193822ced1b32cb98dacad2144f938ea198b99b..40a0519b36b1465b0a17f1094fffc44630534953 100644
--- a/v3_3_0/CDT-subscription-v3_3_0.xsd
+++ b/v3_3_0/CDT-subscription-v3_3_0.xsd
@@ -27,9 +27,9 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_3_0.xsd" />
 
 	<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd b/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd
index cafb6ebd1e63766639b081d4ee8b79e73ac49b88..788f54cb2b994030ec23d3ca4d134fe3965b0b57 100644
--- a/v3_3_0/CDT-svcFwWrapper-v3_3_0.xsd
+++ b/v3_3_0/CDT-svcFwWrapper-v3_3_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-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 	
 	<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd b/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd
index 216f6dfdfe77d218c87ab08f0994da2b9add3f0e..6b147cc899a36331d9b1a6247216e4eb555b7f04 100644
--- a/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd
+++ b/v3_3_0/CDT-svcObjWrapper-v3_3_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />	
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-allJoynApp-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />	
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-allJoynApp-v3_3_0.xsd" />
 	
 	<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-timeSeries-v3_3_0.xsd b/v3_3_0/CDT-timeSeries-v3_3_0.xsd
index 74e53c4f88a4490cc6669ba2c6fc170fa319b188..aec8b861d09b0e35224a9e9488c66bc04189a5f2 100644
--- a/v3_3_0/CDT-timeSeries-v3_3_0.xsd
+++ b/v3_3_0/CDT-timeSeries-v3_3_0.xsd
@@ -26,10 +26,10 @@ 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-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-semanticDescriptor-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-timeSeriesInstance-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-semanticDescriptor-v3_3_0.xsd" />
 	
 
 	<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd b/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd
index 1f787d7bf7c4d8869830b3573a7780f4f33aa345..2f1982fd3e4ed16bc3a45dd0123564de80a784db 100644
--- a/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd
+++ b/v3_3_0/CDT-timeSeriesInstance-v3_3_0.xsd
@@ -26,7 +26,7 @@ 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-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
 
 	<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-token-v3_3_0.xsd b/v3_3_0/CDT-token-v3_3_0.xsd
index c08a407abd5adb8598b25ea632d56ddd48022d39..15888679c4b6b747e478a358fc5a2a84faa5d0cc 100644
--- a/v3_3_0/CDT-token-v3_3_0.xsd
+++ b/v3_3_0/CDT-token-v3_3_0.xsd
@@ -26,7 +26,7 @@ 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-subscription-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
 
 	<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
 		<xs:complexType>
diff --git a/v3_3_0/CDT-trafficPattern-v3_3_0.xsd b/v3_3_0/CDT-trafficPattern-v3_3_0.xsd
index 93e8d44428037f5977c53d3dc02c6d69decd01f8..01163ebfb435180b08051b08ddc5cf227b86db06 100644
--- a/v3_3_0/CDT-trafficPattern-v3_3_0.xsd
+++ b/v3_3_0/CDT-trafficPattern-v3_3_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
 	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
-	<xs:include schemaLocation="CDT-commonTypes-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v3_2_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v3_2_0.xsd" />
+	<xs:include schemaLocation="CDT-commonTypes-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-subscription-v3_3_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v3_3_0.xsd" />
 	
 	<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
 		<xs:complexType>