diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 1a9eba24d049a02e867f55bca473c36510647e3c..9b459b2349f83dde61396971f95d486afbca0444 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -486,7 +486,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 <!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
 	<xs:complexType name="primitiveContent">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
+		<xs:choice minOccurs="0" >
 			<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
 			<xs:any namespace="##other" processContents="lax"  />
 		</xs:choice>
diff --git a/CDT-notification.xsd b/CDT-notification.xsd
index 777a37604aa7c7abcab31846d9f628ebdb394bf9..26ac7ff976a30007357eeb762cefe478e94e9354 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.xsd
@@ -91,9 +91,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="1" />
             <!-- Dynamic Authorization Response -->
             <xs:enumeration value="2" />
-            <!-- Receiver E2E Rand Object Request -->
+            <!-- receiverESPrimRandObject Request -->
             <xs:enumeration value="3" />
-            <!-- Receiver E2E Rand Object Response -->
+            <!-- receiverESPrimRandObject Response -->
             <xs:enumeration value="4" />
             <!-- ESPrim Object -->
             <xs:enumeration value="5" />