diff --git a/CDT-timeSeriesNotification.xsd b/CDT-timeSeriesNotification.xsd
index 1ef090f084e2d5dbb79eb5033e4f8a4e07776109..6f97888c2d9791283b0cd41bf84dae6540fe1d26 100644
--- a/CDT-timeSeriesNotification.xsd
+++ b/CDT-timeSeriesNotification.xsd
@@ -27,13 +27,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
     <xs:include schemaLocation="CDT-commonTypes.xsd"/>
     
 
-        <xs:element name="timeSeriesNotification">      
-			<xs:complexType>
-                <xs:sequence>
-                    <xs:element name="missingDataList" type="m2m:missingDataList"/>
-                    <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
-                </xs:sequence>
-			</xs:complexType>
-		</xs:element>
+        <xs:element name="timeSeriesNotification" type="m2m:timeSeriesNotificationType" />      
+		
+		<xs:complexType name="timeSeriesNotificationType">
+			<xs:sequence>
+				<xs:element name="missingDataList" type="m2m:missingDataList"/>
+				<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
+			</xs:sequence>
+		</xs:complexType>
 	
 </xs:schema>
diff --git a/CDT-triggerPayload.xsd b/CDT-triggerPayload.xsd
index d4ebbd289f13bf4cb8df407f5bfdf6c9517c4b7e..df6e49c9522bbbd97469f935e7940cf972b0ca35 100644
--- a/CDT-triggerPayload.xsd
+++ b/CDT-triggerPayload.xsd
@@ -29,20 +29,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:include schemaLocation="CDT-commonTypes.xsd" />
 	
-	<xs:element name="triggerPayload">
-		<xs:complexType>
-			<xs:sequence>
-				<!-- Parameter Trigger Purpose -->
-				<xs:element name="triggerPurpose" type="m2m:triggerPurpose"/>
-				<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0"/>
-				<xs:element name="triggerInfoPoA" type="m2m:poaList" minOccurs="0"/>
-				<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/>
-				<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/>
-				<xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/>
-				<xs:element name="triggerInfoSerializationTypes" type="m2m:serializations" minOccurs="0"/>      
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+	<xs:element name="triggerPayload" type="m2m:triggerPayloadType" />
+		
+	<xs:complexType name="triggerPayloadType">
+		<xs:sequence>
+			<!-- Parameter Trigger Purpose -->
+			<xs:element name="triggerPurpose" type="m2m:triggerPurpose"/>
+			<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0"/>
+			<xs:element name="triggerInfoPoA" type="m2m:poaList" minOccurs="0"/>
+			<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/>
+			<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/>
+			<xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/>
+			<xs:element name="triggerInfoSerializationTypes" type="m2m:serializations" minOccurs="0"/>      
+		</xs:sequence>
+	</xs:complexType>
 	
 </xs:schema>