diff --git a/Documentation/testcases/partof/fail-a_group_entity_must_match_exactly_1_2.ids b/Documentation/testcases/partof/fail-a_group_entity_must_match_exactly_1_2.ids
index 5d683a0..c25cfa0 100644
--- a/Documentation/testcases/partof/fail-a_group_entity_must_match_exactly_1_2.ids
+++ b/Documentation/testcases/partof/fail-a_group_entity_must_match_exactly_1_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelAssignsToGroup" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCGROUP</simpleValue>
+                        <name>
+                            <simpleValue>IFCGROUP</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/fail-an_aggregate_may_specify_the_entity_of_the_whole_2_2.ids b/Documentation/testcases/partof/fail-an_aggregate_may_specify_the_entity_of_the_whole_2_2.ids
index e68e890..2c13e72 100644
--- a/Documentation/testcases/partof/fail-an_aggregate_may_specify_the_entity_of_the_whole_2_2.ids
+++ b/Documentation/testcases/partof/fail-an_aggregate_may_specify_the_entity_of_the_whole_2_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelAggregates" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCWALL</simpleValue>
+                        <name>
+                            <simpleValue>IFCWALL</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/fail-the_container_entity_must_match_exactly_1_2.ids b/Documentation/testcases/partof/fail-the_container_entity_must_match_exactly_1_2.ids
index bbf8723..193f1f3 100644
--- a/Documentation/testcases/partof/fail-the_container_entity_must_match_exactly_1_2.ids
+++ b/Documentation/testcases/partof/fail-the_container_entity_must_match_exactly_1_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelContainedInSpatialStructure" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCSITE</simpleValue>
+                        <name>
+                            <simpleValue>IFCSITE</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/fail-the_nest_entity_must_match_exactly_1_2.ids b/Documentation/testcases/partof/fail-the_nest_entity_must_match_exactly_1_2.ids
index e77bfba..1ced743 100644
--- a/Documentation/testcases/partof/fail-the_nest_entity_must_match_exactly_1_2.ids
+++ b/Documentation/testcases/partof/fail-the_nest_entity_must_match_exactly_1_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelNests" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCBEAM</simpleValue>
+                        <name>
+                            <simpleValue>IFCBEAM</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-a_group_entity_must_match_exactly_2_2.ids b/Documentation/testcases/partof/pass-a_group_entity_must_match_exactly_2_2.ids
index 0fc21b5..043bf5c 100644
--- a/Documentation/testcases/partof/pass-a_group_entity_must_match_exactly_2_2.ids
+++ b/Documentation/testcases/partof/pass-a_group_entity_must_match_exactly_2_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelAssignsToGroup" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCINVENTORY</simpleValue>
+                        <name>
+                            <simpleValue>IFCINVENTORY</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-an_aggregate_entity_may_pass_any_ancestral_whole_passes.ids b/Documentation/testcases/partof/pass-an_aggregate_entity_may_pass_any_ancestral_whole_passes.ids
index 4c1cd33..ac94f3a 100644
--- a/Documentation/testcases/partof/pass-an_aggregate_entity_may_pass_any_ancestral_whole_passes.ids
+++ b/Documentation/testcases/partof/pass-an_aggregate_entity_may_pass_any_ancestral_whole_passes.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelAggregates" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCELEMENTASSEMBLY</simpleValue>
+                        <name>
+                            <simpleValue>IFCELEMENTASSEMBLY</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-an_aggregate_may_specify_the_entity_of_the_whole_1_2.ids b/Documentation/testcases/partof/pass-an_aggregate_may_specify_the_entity_of_the_whole_1_2.ids
index 1e7495e..5490dc5 100644
--- a/Documentation/testcases/partof/pass-an_aggregate_may_specify_the_entity_of_the_whole_1_2.ids
+++ b/Documentation/testcases/partof/pass-an_aggregate_may_specify_the_entity_of_the_whole_1_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelAggregates" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCSLAB</simpleValue>
+                        <name>
+                            <simpleValue>IFCSLAB</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-nesting_may_be_indirect.ids b/Documentation/testcases/partof/pass-nesting_may_be_indirect.ids
index 6903d02..c351d6e 100644
--- a/Documentation/testcases/partof/pass-nesting_may_be_indirect.ids
+++ b/Documentation/testcases/partof/pass-nesting_may_be_indirect.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelNests" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCFURNITURE</simpleValue>
+                        <name>
+                            <simpleValue>IFCFURNITURE</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-the_container_entity_must_match_exactly_2_2.ids b/Documentation/testcases/partof/pass-the_container_entity_must_match_exactly_2_2.ids
index 89f41b9..a194cca 100644
--- a/Documentation/testcases/partof/pass-the_container_entity_must_match_exactly_2_2.ids
+++ b/Documentation/testcases/partof/pass-the_container_entity_must_match_exactly_2_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelContainedInSpatialStructure" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCSPACE</simpleValue>
+                        <name>
+                            <simpleValue>IFCSPACE</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids b/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids
index bcb8856..44cbed9 100644
--- a/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids
+++ b/Documentation/testcases/partof/pass-the_container_may_be_indirect.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelContainedInSpatialStructure" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCSPACE</simpleValue>
+                        <name>
+                            <simpleValue>IFCSPACE</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>
diff --git a/Documentation/testcases/partof/pass-the_nest_entity_must_match_exactly_2_2.ids b/Documentation/testcases/partof/pass-the_nest_entity_must_match_exactly_2_2.ids
index a55bb6b..62bb1af 100644
--- a/Documentation/testcases/partof/pass-the_nest_entity_must_match_exactly_2_2.ids
+++ b/Documentation/testcases/partof/pass-the_nest_entity_must_match_exactly_2_2.ids
@@ -14,10 +14,12 @@
             <requirements>
                 <partOf relation="IfcRelNests" minOccurs="1" maxOccurs="1">
                     <entity>
-                        <simpleValue>IFCFURNITURE</simpleValue>
+                        <name>
+                            <simpleValue>IFCFURNITURE</simpleValue>
+                        </name>
                     </entity>
                 </partOf>
             </requirements>
         </specification>
     </specifications>
-</ids>
\ No newline at end of file
+</ids>