diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index 76ca9c6fbac92a6a27593d98d7282898fa0e1135..0dab420039f647b9666ef2820e4876dafac86c92 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -798,7 +798,9 @@
   </xs:simpleType>
 
   <xs:simpleType name="X1ObjectType">
-    <xs:restriction base="xs:string"></xs:restriction>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
+    </xs:restriction>
   </xs:simpleType>
   
   <xs:complexType name="X1Object" abstract="true">
@@ -828,7 +830,7 @@
   </xs:complexType>
 
 
-  <xs:complexType name="CreateObject">
+  <xs:complexType name="CreateObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -849,11 +851,11 @@
   </xs:complexType>
 
 
-  <xs:complexType name="UpdateObject">
+  <xs:complexType name="ModifyObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
-          <xs:element name="updateObject" type="X1Object"></xs:element>
+          <xs:element name="modifyObject" type="X1Object"></xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -870,7 +872,7 @@
   </xs:complexType>
 
   
-  <xs:complexType name="GetObject">
+  <xs:complexType name="GetObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -891,7 +893,7 @@
   </xs:complexType>
   
   
-  <xs:complexType name="DeleteObject">
+  <xs:complexType name="DeleteObjectRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
@@ -912,7 +914,7 @@
   </xs:complexType>
   
 
-  <xs:complexType name="ListObjectsOfType">
+  <xs:complexType name="ListObjectsOfTypeRequest">
     <xs:complexContent>
       <xs:extension base="X1RequestMessage">
         <xs:sequence>
diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml
index 2544ee1076d9d5bbaa1aa58b6a1d655450768ca4..d64190ee77ea6caccc42e3e2a4155ef4627a1c2b 100644
--- a/103221-1/examples/CreateObject_example.xml
+++ b/103221-1/examples/CreateObject_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <x1RequestMessage xsi:type="CreateObject">
+  <x1RequestMessage xsi:type="CreateObjectRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml
index e51badd0385442b30590cbceb2bbabd36c472d52..a39e67b875fd687db59fd938ecf173dbe51222c1 100644
--- a/103221-1/examples/GetObjectResponse_example.xml
+++ b/103221-1/examples/GetObjectResponse_example.xml
@@ -8,6 +8,7 @@
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
     <object xsi:type="FooObject">
       <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
+      <Foo>1</Foo>
     </object>
   </x1ResponseMessage>
 </X1Response>
diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml
index 8876a1f884756565958d39ca35ac822e0dfa8c1d..6e6187b88077da43452f4b04a3cff32f6edfb99f 100644
--- a/103221-1/examples/ListObject_example.xml
+++ b/103221-1/examples/ListObject_example.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <x1RequestMessage xsi:type="ListObjectsOfType">
+  <x1RequestMessage xsi:type="ListObjectsOfTypeRequest">
     <admfIdentifier>admfID</admfIdentifier>
     <neIdentifier>neID</neIdentifier>
     <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
     <version>v1.6.1</version>
     <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
-    <objectType>FooObject</objectType>
+    <objectType>Q{http://uri.etsi.org/03221/X1/2017/10}Foo</objectType>
   </x1RequestMessage>
 </X1Request>