diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index cc0b7e3a989eff7d6d92da1ba152e3df890fca36..daa2f55f5e25d2f7d7cb651953fccf46bd3746f7 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -5,8 +5,8 @@
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>1152</x>
-      <y>1424</y>
+      <x>1128</x>
+      <y>1464</y>
       <w>232</w>
       <h>208</h>
     </coordinates>
@@ -36,8 +36,8 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1256</x>
-      <y>1504</y>
+      <x>1232</x>
+      <y>1544</y>
       <w>88</w>
       <h>32</h>
     </coordinates>
@@ -51,8 +51,8 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1256</x>
-      <y>1536</y>
+      <x>1232</x>
+      <y>1576</y>
       <w>88</w>
       <h>24</h>
     </coordinates>
@@ -64,8 +64,8 @@ group=1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1264</x>
-      <y>1056</y>
+      <x>1240</x>
+      <y>1096</y>
       <w>120</w>
       <h>176</h>
     </coordinates>
@@ -88,8 +88,8 @@ void</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>768</x>
-      <y>1120</y>
+      <x>744</x>
+      <y>1160</y>
       <w>112</w>
       <h>64</h>
     </coordinates>
@@ -101,8 +101,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>768</x>
-      <y>1056</y>
+      <x>744</x>
+      <y>1096</y>
       <w>112</w>
       <h>64</h>
     </coordinates>
@@ -114,8 +114,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>384</x>
-      <y>1056</y>
+      <x>360</x>
+      <y>1096</y>
       <w>152</w>
       <h>120</h>
     </coordinates>
@@ -134,8 +134,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>528</x>
-      <y>1016</y>
+      <x>504</x>
+      <y>1056</y>
       <w>544</w>
       <h>96</h>
     </coordinates>
@@ -147,8 +147,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>528</x>
-      <y>1016</y>
+      <x>504</x>
+      <y>1056</y>
       <w>544</w>
       <h>144</h>
     </coordinates>
@@ -160,12 +160,12 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>864</x>
-      <y>1152</y>
+      <x>840</x>
+      <y>1192</y>
       <w>152</w>
       <h>40</h>
     </coordinates>
-    <panel_attributes>SimpleType
+    <panel_attributes>Simple
 --
 *@ type : BasicType*
 fg=blue</panel_attributes>
@@ -174,8 +174,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1008</x>
-      <y>1176</y>
+      <x>984</x>
+      <y>1216</y>
       <w>272</w>
       <h>32</h>
     </coordinates>
@@ -187,8 +187,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>864</x>
-      <y>1248</y>
+      <x>840</x>
+      <y>1288</y>
       <w>152</w>
       <h>88</h>
     </coordinates>
@@ -205,8 +205,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>528</x>
-      <y>1136</y>
+      <x>504</x>
+      <y>1176</y>
       <w>352</w>
       <h>144</h>
     </coordinates>
@@ -218,8 +218,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1008</x>
-      <y>1224</y>
+      <x>984</x>
+      <y>1264</y>
       <w>336</w>
       <h>112</h>
     </coordinates>
@@ -231,12 +231,12 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>864</x>
-      <y>1056</y>
+      <x>840</x>
+      <y>1096</y>
       <w>152</w>
       <h>40</h>
     </coordinates>
-    <panel_attributes>StructType
+    <panel_attributes>Struct
 --
 - DataType : DataType
 fg=blue</panel_attributes>
@@ -245,12 +245,12 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>864</x>
-      <y>1104</y>
+      <x>840</x>
+      <y>1144</y>
       <w>152</w>
       <h>40</h>
     </coordinates>
-    <panel_attributes>ArrayType
+    <panel_attributes>Array
 --
 - DataType : DataType
 fg=blue</panel_attributes>
@@ -259,8 +259,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>768</x>
-      <y>1096</y>
+      <x>744</x>
+      <y>1136</y>
       <w>112</w>
       <h>40</h>
     </coordinates>
@@ -273,8 +273,8 @@ fontsize=12
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>384</x>
-      <y>944</y>
+      <x>360</x>
+      <y>984</y>
       <w>1000</w>
       <h>32</h>
     </coordinates>
@@ -288,8 +288,8 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>96</x>
-      <y>72</y>
+      <x>72</x>
+      <y>112</y>
       <w>1288</w>
       <h>32</h>
     </coordinates>
@@ -303,8 +303,8 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>664</x>
-      <y>176</y>
+      <x>640</x>
+      <y>216</y>
       <w>192</w>
       <h>168</h>
     </coordinates>
@@ -328,8 +328,8 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>944</x>
-      <y>176</y>
+      <x>920</x>
+      <y>216</y>
       <w>176</w>
       <h>104</h>
     </coordinates>
@@ -347,8 +347,8 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1216</x>
-      <y>248</y>
+      <x>1192</x>
+      <y>288</y>
       <w>168</w>
       <h>104</h>
     </coordinates>
@@ -366,8 +366,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1112</x>
-      <y>248</y>
+      <x>1088</x>
+      <y>288</y>
       <w>120</w>
       <h>32</h>
     </coordinates>
@@ -379,8 +379,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>112</x>
-      <y>176</y>
+      <x>88</x>
+      <y>216</y>
       <w>184</w>
       <h>128</h>
     </coordinates>
@@ -400,8 +400,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>176</y>
+      <x>520</x>
+      <y>216</y>
       <w>136</w>
       <h>64</h>
     </coordinates>
@@ -413,8 +413,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>376</x>
-      <y>424</y>
+      <x>352</x>
+      <y>464</y>
       <w>176</w>
       <h>120</h>
     </coordinates>
@@ -433,8 +433,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>272</y>
+      <x>520</x>
+      <y>312</y>
       <w>56</w>
       <h>72</h>
     </coordinates>
@@ -446,8 +446,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>352</y>
+      <x>520</x>
+      <y>392</y>
       <w>136</w>
       <h>128</h>
     </coordinates>
@@ -459,8 +459,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1216</x>
-      <y>472</y>
+      <x>1192</x>
+      <y>512</y>
       <w>168</w>
       <h>40</h>
     </coordinates>
@@ -472,8 +472,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>848</x>
-      <y>176</y>
+      <x>824</x>
+      <y>216</y>
       <w>112</w>
       <h>56</h>
     </coordinates>
@@ -485,8 +485,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1168</x>
-      <y>472</y>
+      <x>1144</x>
+      <y>512</y>
       <w>64</w>
       <h>32</h>
     </coordinates>
@@ -498,8 +498,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>848</x>
-      <y>224</y>
+      <x>824</x>
+      <y>264</y>
       <w>112</w>
       <h>96</h>
     </coordinates>
@@ -511,8 +511,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>944</x>
-      <y>288</y>
+      <x>920</x>
+      <y>328</y>
       <w>176</w>
       <h>144</h>
     </coordinates>
@@ -535,8 +535,8 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>944</x>
-      <y>440</y>
+      <x>920</x>
+      <y>480</y>
       <w>176</w>
       <h>88</h>
     </coordinates>
@@ -553,8 +553,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>848</x>
-      <y>304</y>
+      <x>824</x>
+      <y>344</y>
       <w>112</w>
       <h>168</h>
     </coordinates>
@@ -566,8 +566,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>176</y>
+      <x>520</x>
+      <y>216</y>
       <w>136</w>
       <h>336</h>
     </coordinates>
@@ -579,8 +579,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>376</x>
-      <y>312</y>
+      <x>352</x>
+      <y>352</y>
       <w>176</w>
       <h>104</h>
     </coordinates>
@@ -598,8 +598,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>392</y>
+      <x>520</x>
+      <y>432</y>
       <w>64</w>
       <h>64</h>
     </coordinates>
@@ -611,8 +611,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>176</y>
+      <x>520</x>
+      <y>216</y>
       <w>136</w>
       <h>224</h>
     </coordinates>
@@ -623,8 +623,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>352</y>
+      <x>520</x>
+      <y>392</y>
       <w>136</w>
       <h>32</h>
     </coordinates>
@@ -634,8 +634,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>664</x>
-      <y>352</y>
+      <x>640</x>
+      <y>392</y>
       <w>192</w>
       <h>104</h>
     </coordinates>
@@ -646,7 +646,7 @@ fontsize=12</panel_attributes>
 /@ value : text/
 /@ semanticURI : uri/
 /- Doc : Doc/
-- DataType : SimpleType
+- DataType : Simple
 fg=blue
 transparency=80</panel_attributes>
     <additional_attributes/>
@@ -654,8 +654,8 @@ transparency=80</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1112</x>
-      <y>176</y>
+      <x>1088</x>
+      <y>216</y>
       <w>56</w>
       <h>320</h>
     </coordinates>
@@ -667,8 +667,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>848</x>
-      <y>304</y>
+      <x>824</x>
+      <y>344</y>
       <w>56</w>
       <h>80</h>
     </coordinates>
@@ -680,18 +680,18 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>624</x>
-      <y>1064</y>
+      <x>600</x>
+      <y>1104</y>
       <w>152</w>
       <h>88</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 TypeChoice
 --
-SimpleType : SimpleType
-Struct : StructType
-Array : ArrayType
-Enum : EnumType
+SimpleType : Simple
+Struct : Struct
+Array : Array
+Enum : Enum
 
 </panel_attributes>
     <additional_attributes/>
@@ -699,8 +699,8 @@ Enum : EnumType
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>528</x>
-      <y>1072</y>
+      <x>504</x>
+      <y>1112</y>
       <w>112</w>
       <h>64</h>
     </coordinates>
@@ -712,8 +712,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>240</y>
+      <x>520</x>
+      <y>280</y>
       <w>136</w>
       <h>136</h>
     </coordinates>
@@ -724,8 +724,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>288</x>
-      <y>144</y>
+      <x>264</x>
+      <y>184</y>
       <w>392</w>
       <h>88</h>
     </coordinates>
@@ -736,8 +736,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>544</x>
-      <y>256</y>
+      <x>520</x>
+      <y>296</y>
       <w>64</w>
       <h>192</h>
     </coordinates>
@@ -749,12 +749,12 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>864</x>
-      <y>1200</y>
+      <x>840</x>
+      <y>1240</y>
       <w>152</w>
       <h>40</h>
     </coordinates>
-    <panel_attributes>EnumType
+    <panel_attributes>Enum
 --
 *- EnumValue : EnumValue*
 fg=blue</panel_attributes>
@@ -763,8 +763,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>768</x>
-      <y>1128</y>
+      <x>744</x>
+      <y>1168</y>
       <w>112</w>
       <h>104</h>
     </coordinates>
@@ -776,8 +776,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1064</x>
-      <y>1216</y>
+      <x>1040</x>
+      <y>1256</y>
       <w>168</w>
       <h>88</h>
     </coordinates>
@@ -794,8 +794,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1008</x>
-      <y>1216</y>
+      <x>984</x>
+      <y>1256</y>
       <w>72</w>
       <h>32</h>
     </coordinates>
@@ -807,8 +807,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1224</x>
-      <y>1224</y>
+      <x>1200</x>
+      <y>1264</y>
       <w>88</w>
       <h>64</h>
     </coordinates>
@@ -820,8 +820,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>432</x>
-      <y>696</y>
+      <x>408</x>
+      <y>736</y>
       <w>176</w>
       <h>64</h>
     </coordinates>
@@ -837,8 +837,8 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>928</x>
-      <y>696</y>
+      <x>904</x>
+      <y>736</y>
       <w>192</w>
       <h>56</h>
     </coordinates>
@@ -852,8 +852,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>856</x>
-      <y>696</y>
+      <x>832</x>
+      <y>736</y>
       <w>88</w>
       <h>56</h>
     </coordinates>
@@ -866,8 +866,8 @@ fontsize=12
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>384</x>
-      <y>696</y>
+      <x>360</x>
+      <y>736</y>
       <w>64</w>
       <h>32</h>
     </coordinates>
@@ -879,8 +879,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1208</x>
-      <y>696</y>
+      <x>1184</x>
+      <y>736</y>
       <w>176</w>
       <h>128</h>
     </coordinates>
@@ -900,8 +900,8 @@ subdevice
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1112</x>
-      <y>696</y>
+      <x>1088</x>
+      <y>736</y>
       <w>112</w>
       <h>56</h>
     </coordinates>
@@ -913,8 +913,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>928</x>
-      <y>760</y>
+      <x>904</x>
+      <y>800</y>
       <w>192</w>
       <h>56</h>
     </coordinates>
@@ -928,8 +928,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>856</x>
-      <y>744</y>
+      <x>832</x>
+      <y>784</y>
       <w>88</w>
       <h>48</h>
     </coordinates>
@@ -942,8 +942,8 @@ fontsize=12
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1112</x>
-      <y>696</y>
+      <x>1088</x>
+      <y>736</y>
       <w>112</w>
       <h>120</h>
     </coordinates>
@@ -955,8 +955,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>688</x>
-      <y>696</y>
+      <x>664</x>
+      <y>736</y>
       <w>176</w>
       <h>64</h>
     </coordinates>
@@ -973,8 +973,8 @@ Includes : Include
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>600</x>
-      <y>704</y>
+      <x>576</x>
+      <y>744</y>
       <w>104</w>
       <h>56</h>
     </coordinates>
@@ -987,8 +987,8 @@ fontsize=12
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>376</x>
-      <y>176</y>
+      <x>352</x>
+      <y>216</y>
       <w>176</w>
       <h>128</h>
     </coordinates>
@@ -1009,8 +1009,8 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>288</x>
-      <y>288</y>
+      <x>264</x>
+      <y>328</y>
       <w>104</w>
       <h>56</h>
     </coordinates>
@@ -1022,8 +1022,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>288</x>
-      <y>176</y>
+      <x>264</x>
+      <y>216</y>
       <w>104</w>
       <h>104</h>
     </coordinates>
@@ -1035,8 +1035,8 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>384</x>
-      <y>608</y>
+      <x>360</x>
+      <y>648</y>
       <w>1000</w>
       <h>32</h>
     </coordinates>
diff --git a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
index 38fae6a92cde0f2c321e94963313494eb24dfd54..6f9115b3e99997d5b5b470e98f6bb11671f410c7 100644
Binary files a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png and b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_UML_DataType.png b/SDT/schema4.0/docs/images/SDT_UML_DataType.png
index 113771b84a82d00cff2f78639cabb21f475afa13..743d3ac3d9a3632dc06b512e66ad621042131a81 100644
Binary files a/SDT/schema4.0/docs/images/SDT_UML_DataType.png and b/SDT/schema4.0/docs/images/SDT_UML_DataType.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_simplified.png b/SDT/schema4.0/docs/images/SDT_simplified.png
index f3ff40db0d91f40696e54e5a7e03d980b153214e..b4d8cf68e8e59a22246ca82cfba97a1fdf67453c 100644
Binary files a/SDT/schema4.0/docs/images/SDT_simplified.png and b/SDT/schema4.0/docs/images/SDT_simplified.png differ
diff --git a/SDT/schema4.0/etc/domain.rnc b/SDT/schema4.0/etc/domain.rnc
index 0b1a4d113ffbf52a2dc817fea14bc32e69961ffc..dbbf7455466217f662f37f9f1cad7312f244fee4 100644
--- a/SDT/schema4.0/etc/domain.rnc
+++ b/SDT/schema4.0/etc/domain.rnc
@@ -28,7 +28,7 @@ PropertiesDef =
       attribute value { text }?,
       attribute semanticURI { xsd:anyURI }?,
       DocDef,
-      SimpleType
+      Simple
     }+
   }
 DataTypeDef =
@@ -37,16 +37,16 @@ DataTypeDef =
     attribute unitOfMeasure { text }?,
     attribute semanticURI { xsd:anyURI }?,
     DocDef,
-    (ExtendDef? | (StructType | ArrayType | SimpleType | EnumType)),
+    (ExtendDef? | (Struct | Array | Simple | Enum)),
     ConstraintsDef?
   }
-StructType = element Struct { DataTypeDef+ }
-ArrayType = element Array { DataTypeDef }
-SimpleType =
-  element SimpleType {
+Struct = element Struct { DataTypeDef+ }
+Array = element Array { DataTypeDef }
+Simple =
+  element Simple {
     attribute type { BasicType }
   }
-EnumType = element Enum { EnumValueDef+ }
+Enum = element Enum { EnumValueDef+ }
 BasicType =
   "integer"
   | "boolean"
diff --git a/SDT/schema4.0/src/domain.rng b/SDT/schema4.0/src/domain.rng
index 267bc6d6841f8e1182c04f848f29416bfe4a8438..2e5b5c0e63861dbdb02ed6db2db3015898799acd 100644
--- a/SDT/schema4.0/src/domain.rng
+++ b/SDT/schema4.0/src/domain.rng
@@ -84,7 +84,7 @@
 						</attribute>
 					</optional>
 					<ref name="DocDef"/>
-					<ref name="SimpleType" />
+					<ref name="Simple" />
 				</element>
 			</oneOrMore>
 		</element>
@@ -114,10 +114,10 @@
 					<ref name="ExtendDef" />
 				</optional>
 				<choice>
-					<ref name="StructType" />
-					<ref name="ArrayType" />
-					<ref name="SimpleType" />
-					<ref name="EnumType" />
+					<ref name="Struct" />
+					<ref name="Array" />
+					<ref name="Simple" />
+					<ref name="Enum" />
 				</choice>
 			</choice>
 			<optional>
@@ -127,7 +127,7 @@
 	</define>
 
 
-	<define name="StructType">
+	<define name="Struct">
 		<element name="Struct">
 			<oneOrMore>
 				<ref name="DataTypeDef" />
@@ -136,15 +136,15 @@
 	</define>
 
 
-	<define name="ArrayType">
+	<define name="Array">
 		<element name="Array">
 			<ref name="DataTypeDef" />
 		</element>
 	</define>
 
 
-	<define name="SimpleType">
-		<element name="SimpleType">
+	<define name="Simple">
+		<element name="Simple">
 			<attribute name="type">
 				<ref name="BasicType" />
 			</attribute>
@@ -152,7 +152,7 @@
 	</define>
 	
 
-	<define name="EnumType">
+	<define name="Enum">
 		<element name="Enum">
 			<oneOrMore>
 				<ref name="EnumValueDef" />
diff --git a/SDT/schema4.0/src/domain.xsd b/SDT/schema4.0/src/domain.xsd
index ff074e985bddda70c8f84e8e3fc2acf13ba00f9e..dc251e482a18b35fb44b3e0c1fe2c360b7876863 100644
--- a/SDT/schema4.0/src/domain.xsd
+++ b/SDT/schema4.0/src/domain.xsd
@@ -59,7 +59,7 @@
       <xs:complexContent>
         <xs:extension base="DocDef">
           <xs:sequence>
-            <xs:element ref="SimpleType"/>
+            <xs:element ref="Simple"/>
           </xs:sequence>
           <xs:attribute name="name" use="required" type="xs:Name"/>
           <xs:attribute name="optional" type="xs:boolean"/>
@@ -79,7 +79,7 @@
               <xs:choice>
                 <xs:element ref="Struct"/>
                 <xs:element ref="Array"/>
-                <xs:element ref="SimpleType"/>
+                <xs:element ref="Simple"/>
                 <xs:element ref="Enum"/>
               </xs:choice>
             </xs:choice>
@@ -106,7 +106,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="SimpleType">
+  <xs:element name="Simple">
     <xs:complexType>
       <xs:attribute name="type" use="required" type="BasicType"/>
     </xs:complexType>
diff --git a/SDT/schema4.0/test/EchonetLiteExamples.xml b/SDT/schema4.0/test/EchonetLiteExamples.xml
index fd411ca72f383e31be7f26b24e0fb7f8bb162268..d5b9773ba1b981222687e0b2c5a83c6c707b1d99 100644
--- a/SDT/schema4.0/test/EchonetLiteExamples.xml
+++ b/SDT/schema4.0/test/EchonetLiteExamples.xml
@@ -15,7 +15,7 @@
 				<DataPoint name="operationStatus" readable="true" writable="true">
 					<Doc>This property indicates the ON/OFF status.</Doc>
 					<DataType>
-						<SimpleType type="boolean" />
+						<Simple type="boolean" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -28,7 +28,7 @@
 				<DataPoint name="installationLocation" readable="true" writable="true">
 					<Doc>This property indicates the installation location</Doc>
 					<DataType>
-						<SimpleType type="string" />
+						<Simple type="string" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -46,7 +46,7 @@
 				<DataPoint name="measuredInstantaneousPowerConsumption" readable="true" writable="false">
 					<Doc>This property indicates the instantaneous power consumption of the device in watts.</Doc>
 					<DataType unitOfMeasure="watts">
-						<SimpleType type="integer" />
+						<Simple type="integer" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -57,7 +57,7 @@
 				<DataPoint name="measuredTemperatureValue" readable="true" writable="false">
 					<Doc>This property indicates the measured temperature value in units of 0.1C.</Doc>
 					<DataType unitOfMeasure="celsius">
-						<SimpleType type="integer" />
+						<Simple type="integer" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -74,10 +74,10 @@
 
 			<Properties>
 				<Property name="Name" value="washing machine">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 				<Property name="Vendor" value="ACME">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 			</Properties>
 
@@ -122,25 +122,25 @@
 						<DataPoint name="door_CoverOpen_CloseStatus" readable="true" writable="false">
 							<Doc>This property indicates whether the door/cover is open or closed.</Doc>
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</DataPoint>
 						<DataPoint name="washingMachineSetting" readable="true" writable="true">
 							<Doc>Washing machine setting</Doc>
 							<DataType>
-								<SimpleType type="string" />
+								<Simple type="string" />
 							</DataType>
 						</DataPoint>
 						<DataPoint name="currentStageOfWashingCycle" readable="true" writable="false">
 							<Doc>This property indicates the current stage of the washing cycle.</Doc>
 							<DataType>
-								<SimpleType type="string" />
+								<Simple type="string" />
 							</DataType>
 						</DataPoint>
 						<DataPoint name="timeRemainingToCompleteWashingCycle" readable="true" writable="false">
 							<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
 							<DataType>
-								<SimpleType type="time" />
+								<Simple type="time" />
 							</DataType>
 						</DataPoint>
 
@@ -152,19 +152,19 @@
 						<DataPoint name="onTimerReservationSetting" readable="true" writable="true">
 							<Doc>Reservation ON/OFF</Doc>
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</DataPoint>
 						<DataPoint name="onTimerSetting" readable="true" writable="true">
 							<Doc>Timer value (HH:MM)</Doc>
 							<DataType>
-								<SimpleType type="time" />
+								<Simple type="time" />
 							</DataType>
 						</DataPoint>
 						<DataPoint name="relativeTimeBasedOnTimerSetting" readable="true" writable="true">
 							<Doc>Timer value (HH:MM)</Doc>
 							<DataType>
-								<SimpleType type="time" />
+								<Simple type="time" />
 							</DataType>
 						</DataPoint>
 					</Data>
diff --git a/SDT/schema4.0/test/SimpleExample.xml b/SDT/schema4.0/test/SimpleExample.xml
index d9d097068c985de8ab86096407aeddf619a6e843..b959d2b5105333d88dbc540fc36d2d7abfe63b1f 100644
--- a/SDT/schema4.0/test/SimpleExample.xml
+++ b/SDT/schema4.0/test/SimpleExample.xml
@@ -9,7 +9,7 @@
 						<DataPoint name="status" readable="true" writable="true">
 							<Doc>This property indicates the ON/OFF status.</Doc>
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</DataPoint>
 					</Data>
diff --git a/SDT/schema4.0/test/arg-test.xml b/SDT/schema4.0/test/arg-test.xml
index 5d6261dd6b22120f7cdea8134d287abfe552383a..4828438f3079efbf7e6b5f9637c5816e7de82216 100644
--- a/SDT/schema4.0/test/arg-test.xml
+++ b/SDT/schema4.0/test/arg-test.xml
@@ -10,12 +10,12 @@
 					<Args>
 						<Arg name="argMandatory">
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</Arg>
 						<Arg name="argOptional" optional="true">
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</Arg>
 					</Args>
@@ -24,12 +24,12 @@
 					<Args>
 						<Arg name="arg1" default="true">
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</Arg>
 						<Arg name="arg2" default="foo">
 							<DataType>
-								<SimpleType type="string" />
+								<Simple type="string" />
 							</DataType>
 						</Arg>
 					</Args>
diff --git a/SDT/schema4.0/test/dal-core.xml b/SDT/schema4.0/test/dal-core.xml
index e270b6f849c637866ba9d35a11f9c48da9de0fd1..34a6bc9f12d624bc1c93a0b66a301d76f9a8f2ac 100644
--- a/SDT/schema4.0/test/dal-core.xml
+++ b/SDT/schema4.0/test/dal-core.xml
@@ -16,7 +16,7 @@
 				<Action name="get">
 					<Doc>Obtain the current associated state.</Doc>
 					<DataType>
-						<SimpleType type="boolean" />
+						<Simple type="boolean" />
 					</DataType>
 				</Action>
 				<Action name="setTarget">
@@ -25,7 +25,7 @@
 						<Arg name="value">
 							<Doc>The desired value of the associated state.</Doc>
 							<DataType>
-								<SimpleType type="boolean" />
+								<Simple type="boolean" />
 							</DataType>
 						</Arg>
 					</Args>
diff --git a/SDT/schema4.0/test/dal-eg.xml b/SDT/schema4.0/test/dal-eg.xml
index a29d7e0a63af3177d38e9bd7de5a68338c402ccd..e197de91802c145be93aa6f794df237b38a27b30 100644
--- a/SDT/schema4.0/test/dal-eg.xml
+++ b/SDT/schema4.0/test/dal-eg.xml
@@ -9,12 +9,12 @@
 			<Properties>
 				<Property name="Name">
 					<Doc>Original value: PowerSwitch</Doc>
-					<SimpleType type="string"/>
+					<Simple type="string"/>
 				</Property>
 				<!-- The Vendor field should probably be part of the domain -->
 				<Property name="Vendor">
 					<Doc>Original value: Telekom Innovation Laboratories</Doc>
-					<SimpleType type="string"/>
+					<Simple type="string"/>
 				</Property>
 			</Properties>
 			<ModuleClasses>
@@ -30,7 +30,7 @@
 						<Action name="state">
 							<Doc>Query the state of the switch. Returns the string &quot;<tt>on</tt>&quot; or &quot;<tt>off</tt>&quot;.</Doc>
 							<DataType>
-								<SimpleType type="string"/>
+								<Simple type="string"/>
 							</DataType>
 						</Action>
 					</Actions>
@@ -40,7 +40,7 @@
 							<Data>
 								<DataPoint name="state" writable="false">
 									<DataType>
-										<SimpleType type="boolean"/>
+										<Simple type="boolean"/>
 									</DataType>
 								</DataPoint>
 							</Data>
diff --git a/SDT/schema4.0/test/datapoint-test.xml b/SDT/schema4.0/test/datapoint-test.xml
index 6100a5dec8126e2735960cf6fde3f1c06fce6cef..e7005b011d89f2053d08addf0165270818509de5 100644
--- a/SDT/schema4.0/test/datapoint-test.xml
+++ b/SDT/schema4.0/test/datapoint-test.xml
@@ -7,7 +7,7 @@
 			<Data>
 				<DataPoint name="TestDataPoint" optional="true" default="foo">
 					<DataType>
-						<SimpleType type="string" />
+						<Simple type="string" />
 					</DataType>
 				</DataPoint>
 			</Data>
diff --git a/SDT/schema4.0/test/datatypes-test.xml b/SDT/schema4.0/test/datatypes-test.xml
index 80f9071e69a4c28a0d543c9f1718e0310f183c09..102322080f0ea13d7b54565d70cd2945aee2d0dc 100644
--- a/SDT/schema4.0/test/datatypes-test.xml
+++ b/SDT/schema4.0/test/datatypes-test.xml
@@ -4,7 +4,7 @@
 <Domain id="datatypes-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<DataTypes>
 		<DataType name="temperatureType" unitOfMeasure="C">
-			<SimpleType type="float"/>
+			<Simple type="float"/>
 		</DataType>
 		<DataType name="anEnumType">
 			<Enum>
diff --git a/SDT/schema4.0/test/deviceClass-test.xml b/SDT/schema4.0/test/deviceClass-test.xml
index 1500f3dfe006ca081f36fef665a790ef5e96a5c0..8b96b74fa635d1380d3742a19d8af463c596658f 100644
--- a/SDT/schema4.0/test/deviceClass-test.xml
+++ b/SDT/schema4.0/test/deviceClass-test.xml
@@ -8,7 +8,7 @@
 			<Doc>This is a test device.</Doc>
 			<Properties>
 				<Property name="aProperty">
-					<SimpleType type="string"></SimpleType>
+					<Simple type="string" />
 				</Property>
 			</Properties>
 			<ModuleClasses>
diff --git a/SDT/schema4.0/test/deviceModbusTemperature.xml b/SDT/schema4.0/test/deviceModbusTemperature.xml
index 1ad3801748e038aa29bea14ce1ee076fbde2a0b3..2fdc64c2634fe60fe18d6193a779f3578479b898 100644
--- a/SDT/schema4.0/test/deviceModbusTemperature.xml
+++ b/SDT/schema4.0/test/deviceModbusTemperature.xml
@@ -7,37 +7,37 @@
 				<DataPoint name="currentTemperature" readable="true" writable="false" eventable="true" optional="false">
 					<Doc>The current temperature.</Doc>
 					<DataType>
-						<SimpleType type="float" />
+						<Simple type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="targetTemperature" readable="true" writable="true" eventable="true" optional="true">
 					<Doc>The desired temperature to reach.</Doc>
 					<DataType>
-						<SimpleType type="float" />
+						<Simple type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="unit" readable="true" writable="false" eventable="true" optional="true">
 					<Doc>The unit of measure for the temperature values. The default is Celsius (C).</Doc>
 					<DataType>
-						<SimpleType type="string" />
+						<Simple type="string" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="minValue" readable="true" writable="false" eventable="true" optional="true">
 					<Doc>Minimum value of "targetTemperature".</Doc>
 					<DataType>
-						<SimpleType type="float" />
+						<Simple type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="maxValue" readable="true" writable="false" eventable="true" optional="true">
 					<Doc>Maximum value of "targetTemperature".</Doc>
 					<DataType>
-						<SimpleType type="float" />
+						<Simple type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="stepValue" readable="true" writable="false" eventable="true" optional="true">
 					<Doc>Step value allowed for "targetTemperature".</Doc>
 					<DataType>
-						<SimpleType type="float" />
+						<Simple type="float" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -49,16 +49,16 @@
 			<Doc>This is a test device.</Doc>
 			<Properties>
 				<Property name="address">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 				<Property name="functionCode">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 				<Property name="registers">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 				<Property name="slaveID">
-					<SimpleType type="string" />
+					<Simple type="string" />
 				</Property>
 			</Properties>
 			<ModuleClasses>
diff --git a/SDT/schema4.0/test/example1.SDT.xml b/SDT/schema4.0/test/example1.SDT.xml
index f263033e397e6d22b3c5bec6784ef2ee7137dafe..0837430101de2db65369126e62e6f34ac9ab8b70 100644
--- a/SDT/schema4.0/test/example1.SDT.xml
+++ b/SDT/schema4.0/test/example1.SDT.xml
@@ -12,7 +12,7 @@
 				<DataPoint name="operationStatus" writable="true">
 					<Doc>This property sets the ON/OFF status.</Doc>
 						<DataType>
-							<SimpleType type="boolean"/> 
+							<Simple type="boolean"/> 
 						</DataType>
 				</DataPoint>
 			</Data>
@@ -28,7 +28,7 @@
 				<DataPoint name="installationLocation" writable="true">
 					<Doc>This property indicates the installation location</Doc>
 					<DataType>
-						<SimpleType type="string"/>
+						<Simple type="string"/>
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -42,7 +42,7 @@
 				<DataPoint name="measuredCumulativePowerConsumption" writable="false">
 					<Doc>This indicates cumulative power consumption of the device in increments of 0.001kWh.</Doc>
 					<DataType unitOfMeasure="watt">
-						<SimpleType type="integer"/>
+						<Simple type="integer"/>
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -53,7 +53,7 @@
 				<DataPoint name="onTimer" writable="true">
 					<Doc>Timer value (HH:MM)</Doc>
 					<DataType>
-						<SimpleType type="time"/>
+						<Simple type="time"/>
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -64,7 +64,7 @@
 				<DataPoint name="statusDoor" writable="false">
 					<Doc>This reads the open=true or closed=false status of a door </Doc>
 					<DataType>
-						<SimpleType type="boolean"/>
+						<Simple type="boolean"/>
 					</DataType>
 				</DataPoint>
 			</Data>
diff --git a/SDT/schema4.0/test/extends-test.xml b/SDT/schema4.0/test/extends-test.xml
index bc39389aba49432c6e5d63f17ef6e1654d5c5ca8..c14eead86b99b66b77fa66bafd779d8bac135fef 100644
--- a/SDT/schema4.0/test/extends-test.xml
+++ b/SDT/schema4.0/test/extends-test.xml
@@ -7,12 +7,12 @@
 			<Data>
 				<DataPoint name="TestExtendsDataPoint1" writable="true">
 					<DataType>
-						<SimpleType type="integer" />
+						<Simple type="integer" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="TestExtendsDataPoint2" writable="true">
 					<DataType>
-						<SimpleType type="integer" />
+						<Simple type="integer" />
 					</DataType>
 				</DataPoint>
 			</Data>
@@ -25,7 +25,7 @@
 			<Data>
 				<DataPoint name="TestExtendsDataPoint3" writable="true">
 					<DataType>
-						<SimpleType type="integer" />
+						<Simple type="integer" />
 					</DataType>
 				</DataPoint>
 			</Data>
diff --git a/SDT/schema4.0/test/mseeb.xml b/SDT/schema4.0/test/mseeb.xml
index c729380aed91f7ffca0a21348eec5272f1a51a08..b51533cb46100790b3ea1335d400fdfc71e7444d 100644
--- a/SDT/schema4.0/test/mseeb.xml
+++ b/SDT/schema4.0/test/mseeb.xml
@@ -82,7 +82,7 @@
                         Obtain the current associated state.
                     </Doc>
                     <DataType>
-                        <SimpleType type="boolean" />
+                        <Simple type="boolean" />
                     </DataType>
                 </Action>
                 <Action name="setTarget">
@@ -95,7 +95,7 @@
                             The desired value of the associated state.
                             </Doc>
                             <DataType>
-                                <SimpleType type="boolean" />
+                                <Simple type="boolean" />
                             </DataType>
                         </Arg>
                     </Args>
@@ -106,7 +106,7 @@
                     <Data>
                         <DataPoint name="state" readable="true">
                             <DataType>
-                        		<SimpleType type="boolean" />
+                        		<Simple type="boolean" />
                             </DataType>
                         </DataPoint>
                     </Data>
@@ -128,23 +128,23 @@
             <Properties>
                 <Property name="Name">
                     <Doc>Original value: Multi Socket Electrical-Extension-Block</Doc>
-                    <SimpleType type="string" />
+                    <Simple type="string" />
                 </Property>
                 <Property name="Vendor">
                     <Doc>Original value: HGI</Doc>
-                    <SimpleType type="string" />
+                    <Simple type="string" />
                 </Property>
                 <Property name="FirmwareVersion">
                   <Doc>Original value: 1.0</Doc>
-                  <SimpleType type="string" />
+                  <Simple type="string" />
                 </Property>
                 <Property name="VendorURL">
                   <Doc>Original value: http://www.onem2m.org</Doc>
-                  <SimpleType type="uri" />
+                  <Simple type="uri" />
                 </Property>
                 <Property name="SerialNumber">
                   <Doc>Original value: 1234.5</Doc>
-                  <SimpleType type="string" />
+                  <Simple type="string" />
                 </Property>
             </Properties>
 
@@ -163,7 +163,7 @@
                     <Properties>
                         <Property name="version" value="1.0.0">
                             <Doc>Version for this ModuleClass</Doc>
-                            <SimpleType type="string" />
+                            <Simple type="string" />
                         </Property>
                     </Properties>
                 </ModuleClass>
@@ -177,7 +177,7 @@
                         				<Array>
                                            <DataType>
                                                 <Doc>This is an example simple data type with a minimum-value constraint.</Doc>
-                            					<SimpleType type="float" />
+                            					<Simple type="float" />
                                                 <Constraints>
                                                     <Constraint name="minValue" type="float" value="0.0">
                                                         <Doc>The value must be equal or greater 0.0</Doc>
@@ -192,7 +192,7 @@
                                     <DataType name="timeFrame">
                         				<Array>
                                             <DataType>
-                            					<SimpleType type="datetime" />
+                            					<Simple type="datetime" />
                                             </DataType>
                 				        </Array>
                                     </DataType>
@@ -208,7 +208,7 @@
                             <DataType name="names">
                                 <Array>
                                     <DataType>
-                                        <SimpleType type="string" />
+                                        <Simple type="string" />
                                     </DataType>
                                 </Array>
                             </DataType>
@@ -222,7 +222,7 @@
                                 This datapoint represents the firmware version of the extension block.
                             </Doc>
                             <DataType>
-                                <SimpleType type="string" />
+                                <Simple type="string" />
                             </DataType>
                         </DataPoint>
                         
@@ -235,7 +235,7 @@
                             <DataType>
                                 <Array>
                                     <DataType>
-                                        <SimpleType type="string" />
+                                        <Simple type="string" />
                                     </DataType>
                                 </Array>
                             </DataType>
@@ -257,10 +257,10 @@
                     </Doc>
                     <Properties>
                         <Property name="Name" value="PowerSwitch 1">
-                            <SimpleType type="string" />
+                            <Simple type="string" />
                         </Property>
                         <Property name="Vendor" value="HGI">
-                            <SimpleType type="string" />
+                            <Simple type="string" />
                         </Property>
                     </Properties>
                     <ModuleClasses>
@@ -278,16 +278,16 @@
                     </Doc>
                     <Properties>
                         <Property name="Name" value="PowerSwitch 2">
-                            <SimpleType type="string" />
+                            <Simple type="string" />
                         </Property>
                         <Property name="Vendor" value="HGI">
-                            <SimpleType type="string" />
+                            <Simple type="string" />
                         </Property>
                         <Property name="VendorURL" value="http://www.onem2m.org">
-                            <SimpleType type="uri" />
+                            <Simple type="uri" />
                         </Property>
                         <Property name="maximumAltitude" value="2800">
-                            <SimpleType type="integer" />
+                            <Simple type="integer" />
                         </Property>
                     </Properties>
                     <ModuleClasses>
diff --git a/SDT/schema4.0/test/productClass-test.xml b/SDT/schema4.0/test/productClass-test.xml
index c83ba9312bec444f08b569eab476ba7b7e6b23f3..361ed494eacd2a987351b60a3577359a776d5b2e 100644
--- a/SDT/schema4.0/test/productClass-test.xml
+++ b/SDT/schema4.0/test/productClass-test.xml
@@ -5,7 +5,7 @@
 			<Doc>This is a test product</Doc>
 			<Properties>
 				<Property name="aProperty">
-					<SimpleType type="string"></SimpleType>
+					<Simple type="string" />
 				</Property>
 			</Properties>
 			<ModuleClasses>
diff --git a/SDT/schema4.0/test/semanticURI-test.xml b/SDT/schema4.0/test/semanticURI-test.xml
index 9a4a3518ebe5a8e0c7d2989e01622f27d72f7a9a..e6e6a08220f1858ee95a4414b425276af2739373 100644
--- a/SDT/schema4.0/test/semanticURI-test.xml
+++ b/SDT/schema4.0/test/semanticURI-test.xml
@@ -4,7 +4,7 @@
 <Domain id="semanticURI-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
 	<DataTypes>
 		<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
-			<SimpleType type="float"/>
+			<Simple type="float"/>
 		</DataType>
 		<DataType name="anEnumType" semanticURI="http://example.com/anEnumType.rdf">
 			<Enum>
diff --git a/SDT/schema4.0/test/void-test.xml b/SDT/schema4.0/test/void-test.xml
index 32b836bf511f6508e17abbae2d09b4029a2b1fca..6f115a89990f36917327c2657e90ad0cfa87b4e7 100644
--- a/SDT/schema4.0/test/void-test.xml
+++ b/SDT/schema4.0/test/void-test.xml
@@ -7,14 +7,14 @@
 			<Actions>
 				<Action name="TestVoidAction">
 					<DataType>
-						<SimpleType type="void"/>
+						<Simple type="void"/>
 					</DataType>
 				</Action>
 			</Actions>
 			<Data>
 				<DataPoint name="TestVoidDataPoint" writable="true">
 					<DataType>
-						<SimpleType type="void"/>
+						<Simple type="void"/>
 					</DataType>
 				</DataPoint>
 			</Data>