diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-C.dmn
deleted file mode 100644
index e4bcc761..00000000
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-C.dmn
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-C"
-             name="1158-noname-imports-009-C"
-             id="_i9fboPUUEeesLuP4RHs4vA"
-             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
->
-    <decision name="decision002" id="_decision002">
-        <variable name="decision002"/>
-        <literalExpression>
-            <text>"model_c_decision002"</text>
-        </literalExpression>
-    </decision>
-
-</definitions>
-
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-A.dmn
similarity index 95%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-A.dmn
index a2ba44e2..f8c26fc7 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-001-A"
-             name="1158-noname-imports-001-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-01-A"
+             name="1158-noname-imports-01-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-001-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-01-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-B.dmn
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-B.dmn
index 7d9aa16d..4ae4b514 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-001-B"
-             name="1158-noname-imports-001-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-01-B"
+             name="1158-noname-imports-01-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-test.xml
similarity index 97%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-test.xml
index 0e72f639..62b92e7b 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-001-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-001-A.dmn</modelName>
+    <modelName>1158-noname-imports-01-A.dmn</modelName>
 
     <!-- model A uses a number of no-name imports from model B -->
 
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-A.dmn
similarity index 95%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-A.dmn
index 723b87fc..07b3c75d 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-002-A"
-             name="1158-noname-imports-002-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-02-A"
+             name="1158-noname-imports-02-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-002-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-02-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-B.dmn
similarity index 84%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-B.dmn
index acec4d23..beffc6c7 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-B.dmn
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-002-B"
-             name="1158-noname-imports-002-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-02-B"
+             name="1158-noname-imports-02-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
     <!-- does nothing but effectively import, then re-export everything in model C -->
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-002-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-02-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-C.dmn
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-C.dmn
index 5fca61d4..57f93155 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-002-C"
-             name="1158-noname-imports-002-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-02-C"
+             name="1158-noname-imports-02-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-test.xml
similarity index 97%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-test.xml
index cc73113a..a9752b41 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-002-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-002-A.dmn</modelName>
+    <modelName>1158-noname-imports-02-A.dmn</modelName>
 
     <!-- asserting that imports are recursive in that no-name imports of no-name imports
     are also considered part of the current model namespace.  Here, the model A imports
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-A.dmn
similarity index 95%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-A.dmn
index 811d548e..851480d3 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-003-A"
-             name="1158-noname-imports-003-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-03-A"
+             name="1158-noname-imports-03-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-003-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-03-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-B.dmn
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-B.dmn
index 69455fc9..d98a7068 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-003-B"
-             name="1158-noname-imports-003-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-03-B"
+             name="1158-noname-imports-03-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-test.xml
similarity index 97%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-test.xml
index 8656ccec..5c55ac77 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-003-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-003-A.dmn</modelName>
+    <modelName>1158-noname-imports-03-A.dmn</modelName>
 
     <!-- model A uses a number of no-name imports from model B whose names are already in model A.
     There are no ID conflicts.   We do not expect anything from model B to override model A.-->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-A.dmn
index 782f1537..2feb95a6 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-004-A"
-             name="1158-noname-imports-004-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-04-A"
+             name="1158-noname-imports-04-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-004-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-04-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-B.dmn
similarity index 83%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-B.dmn
index cf172e9c..795b0f27 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-004-B"
-             name="1158-noname-imports-004-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-04-B"
+             name="1158-noname-imports-04-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-test.xml
index ec15a34d..117091c9 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-004-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-004-A.dmn</modelName>
+    <modelName>1158-noname-imports-04-A.dmn</modelName>
 
     <!-- model A has a decision called "allowableDuplicateName".  From model B, it uses an imported
     typeRef also called "allowableDuplicateName".  Name clashes between drg elements and
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-A.dmn
index 07b3a57e..2b3fd210 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-005-A"
-             name="1158-noname-imports-005-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-05-A"
+             name="1158-noname-imports-05-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-005-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-05-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-B.dmn
index 2cce3692..947d3f32 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-B.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-005-B"
-             name="1158-noname-imports-005-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-05-B"
+             name="1158-noname-imports-05-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-005-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-05-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-C.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-C.dmn
index e2cdc9d5..40e535ea 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-C"
-             name="1158-noname-imports-008-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-05-C"
+             name="1158-noname-imports-05-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-test.xml
index 95e121ce..976b7e15 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-005-A.dmn</modelName>
+    <modelName>1158-noname-imports-05-A.dmn</modelName>
 
     <!-- A imports B, B imports C-->
     <!-- Both B & C define decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-A.dmn
index 71abfefb..0298f393 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-A.dmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-006-A"
-             name="1158-noname-imports-006-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-06-A"
+             name="1158-noname-imports-06-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-006-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-06-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-006-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-06-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-B.dmn
index 5e44496c..b6fbde00 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-006-B"
-             name="1158-noname-imports-006-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-06-B"
+             name="1158-noname-imports-06-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-C.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-C.dmn
index e966ea18..be058388 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-007-C"
-             name="1158-noname-imports-007-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-06-C"
+             name="1158-noname-imports-06-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-test.xml
index 1bee3bfd..62dd5776 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-006-A.dmn</modelName>
+    <modelName>1158-noname-imports-06-A.dmn</modelName>
 
     <!-- A imports both B & C -->
     <!-- Both B & C define decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-A.dmn
index 803c1343..7a059f0a 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-A.dmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-A"
-             name="1158-noname-imports-009-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-07-A"
+             name="1158-noname-imports-07-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-07-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-D"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-07-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-B.dmn
similarity index 78%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-B.dmn
index 90af0340..0d415acd 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-007-B"
-             name="1158-noname-imports-007-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-07-B"
+             name="1158-noname-imports-07-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-C.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-C.dmn
index 22771720..1b7e7530 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-006-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-006-C"
-             name="1158-noname-imports-006-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-07-C"
+             name="1158-noname-imports-07-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-test.xml
index d4d4afd6..3eae66b7 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-007-A.dmn</modelName>
+    <modelName>1158-noname-imports-07-A.dmn</modelName>
 
     <!-- A imports both B & C -->
     <!-- Only C defines decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-A.dmn
index fe2ba3c8..0c44d3b3 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-A"
-             name="1158-noname-imports-008-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-A"
+             name="1158-noname-imports-08-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-B.dmn
similarity index 83%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-B.dmn
index da24dee4..481db006 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-B.dmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-B"
-             name="1158-noname-imports-008-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-B"
+             name="1158-noname-imports-08-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-D"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-D"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-C.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-C.dmn
index 71faab45..1921468f 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-005-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-005-C"
-             name="1158-noname-imports-005-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-C"
+             name="1158-noname-imports-08-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-D.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-D.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-D.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-D.dmn
index 62b916f7..7bc21d89 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-D.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-D.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-008-D"
-             name="1158-noname-imports-008-D"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-08-D"
+             name="1158-noname-imports-08-D"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-test.xml
index 351b2c9a..50d426e8 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-008-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-008-A.dmn</modelName>
+    <modelName>1158-noname-imports-08-A.dmn</modelName>
 
     <!-- A imports B, B import C & D -->
     <!-- Both C & D define decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-A.dmn
index 2857d185..4a6cea32 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-A.dmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-A"
-             name="1158-noname-imports-009-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-A"
+             name="1158-noname-imports-09-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-D"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-D"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-B.dmn
similarity index 82%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-B.dmn
index 28fb2053..4c1e7b77 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-B.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-019-A"
-             name="1158-noname-imports-019-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-B"
+             name="1158-noname-imports-09-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-019-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-C.dmn
new file mode 100644
index 00000000..2cf53832
--- /dev/null
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-C.dmn
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-C"
+             name="1158-noname-imports-09-C"
+             id="_i9fboPUUEeesLuP4RHs4vA"
+             xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
+>
+    <decision name="decision002" id="_decision002">
+        <variable name="decision002"/>
+        <literalExpression>
+            <text>"model_c_decision002"</text>
+        </literalExpression>
+    </decision>
+
+</definitions>
+
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-D.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-D.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-D.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-D.dmn
index d7745d3f..2845fa84 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-D.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-D.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-D"
-             name="1158-noname-imports-009-D"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-09-D"
+             name="1158-noname-imports-09-D"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-test.xml
index 81fa234e..0bde58f8 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-009-A.dmn</modelName>
+    <modelName>1158-noname-imports-09-A.dmn</modelName>
 
     <!-- A imports B & D, B import C -->
     <!-- Both C & D define decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-A.dmn
index be4a0ba9..1f715682 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-007-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-A.dmn
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-007-A"
-             name="1158-noname-imports-007-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-A"
+             name="1158-noname-imports-09-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-007-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-007-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-D"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-B.dmn
similarity index 82%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-B.dmn
index 8f91d6d0..abaeadf7 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-B.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-B"
-             name="1158-noname-imports-010-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-B"
+             name="1158-noname-imports-10-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-C.dmn
similarity index 78%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-C.dmn
index 4cbf9cb1..f7667528 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-C.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-C"
-             name="1158-noname-imports-010-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-C"
+             name="1158-noname-imports-10-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-D.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-D.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-D.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-D.dmn
index 0309950e..038ef1ca 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-D.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-D.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-010-D"
-             name="1158-noname-imports-010-D"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-10-D"
+             name="1158-noname-imports-10-D"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-test.xml
index 712ea313..5ccb3853 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-010-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-010-A.dmn</modelName>
+    <modelName>1158-noname-imports-10-A.dmn</modelName>
 
     <!-- A imports B & D, B import C -->
     <!-- Only D defines decision002 -->
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-A.dmn
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-A.dmn
index 3fbdc41a..b7a77d34 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-A.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-011-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-11-A"
              name="allowableDuplicateName"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
@@ -7,7 +7,7 @@
 
     <!-- definitions element shared a name with a typeRef - this is permitted  -->
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-011-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-11-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-B.dmn
similarity index 83%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-B.dmn
index 47b338a9..6bc83d0b 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-011-B"
-             name="1158-noname-imports-011-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-11-B"
+             name="1158-noname-imports-11-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-test.xml
index 54235676..6aeb4435 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-011-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-011-A.dmn</modelName>
+    <modelName>1158-noname-imports-11-A.dmn</modelName>
 
     <!--
     Model A definitions name is "allowableDuplicateName".  From model B, it uses an imported typeRef
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-A.dmn
similarity index 95%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-A.dmn
index 2774a0e6..06c17121 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-A.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-012-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-12-A"
              name="allowableDuplicateName"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
@@ -7,7 +7,7 @@
 
     <!-- definitions element shares a name with an imported decision -->
 
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-012-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-12-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-B.dmn
index dc8ebd82..3d2c001b 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-012-B"
-             name="1158-noname-imports-012-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-12-B"
+             name="1158-noname-imports-12-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-test.xml
index 258923d7..79474206 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-012-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-012-A.dmn</modelName>
+    <modelName>1158-noname-imports-12-A.dmn</modelName>
 
     <!--
 
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-A.dmn
similarity index 91%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-A.dmn
index c6bcd844..8acab6ca 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-013-A"
-             name="1158-noname-imports-013-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-13-A"
+             name="1158-noname-imports-13-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-013-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-13-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-B.dmn
index a1c7b8af..2df8e87a 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-013-B"
-             name="1158-noname-imports-013-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-13-B"
+             name="1158-noname-imports-13-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-test.xml
similarity index 93%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-test.xml
index e83ba6c5..2cd53cf9 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-013-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-013-A.dmn</modelName>
+    <modelName>1158-noname-imports-13-A.dmn</modelName>
 
     <!--
 
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-A.dmn
similarity index 91%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-A.dmn
index 939b525b..7702928e 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-014-A"
-             name="1158-noname-imports-014-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-14-A"
+             name="1158-noname-imports-14-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-014-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-14-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-B.dmn
similarity index 91%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-B.dmn
index ee7ef94c..c5eb6076 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-014-B"
-             name="1158-noname-imports-014-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-14-B"
+             name="1158-noname-imports-14-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-test.xml
index 174d772c..2e283a86 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-014-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-014-A.dmn</modelName>
+    <modelName>1158-noname-imports-14-A.dmn</modelName>
 
     <!--
     Model A has decision001 and decision003.  Model B has decision002 and decision003
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-A.dmn
similarity index 91%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-A.dmn
index b9da5e7f..f1ad0000 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-015-A"
-             name="1158-noname-imports-015-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-15-A"
+             name="1158-noname-imports-15-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-015-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-15-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-B.dmn
index b6afff86..c732e3a3 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-015-B"
-             name="1158-noname-imports-015-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-15-B"
+             name="1158-noname-imports-15-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
@@ -8,7 +8,7 @@
         <variable name="decision002"/>
         <informationRequirement>
             <!-- absolute href -->
-            <requiredDecision href="http://www.montera.com.au/spec/DMN/1158-noname-imports-015-B#_decision003"/>
+            <requiredDecision href="http://www.montera.com.au/spec/DMN/1158-noname-imports-15-B#_decision003"/>
         </informationRequirement>
         <literalExpression>
             <text>decision003</text>
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-test.xml
similarity index 95%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-test.xml
index 50ab5fae..fe590870 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-015-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-015-A.dmn</modelName>
+    <modelName>1158-noname-imports-15-A.dmn</modelName>
 
     <!--
     Model A has decision001 and decision003.  Model B has decision002 and also decision003.
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-A.dmn
index 19a83d7c..9fcd3a98 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-016-A"
-             name="1158-noname-imports-016-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-16-A"
+             name="1158-noname-imports-16-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-016-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-16-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-B.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-B.dmn
index 4eb143f5..5d6a67fc 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-B.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-016-B"
-             name="1158-noname-imports-016-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-16-B"
+             name="1158-noname-imports-16-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-016-A"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-16-A"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-test.xml
index 68c37885..76ff978d 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-016-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-016-A.dmn</modelName>
+    <modelName>1158-noname-imports-16-A.dmn</modelName>
 
     <!--
     Model A imports B. B imports A.
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-A.dmn
similarity index 91%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-A.dmn
index 5b5c9bf7..3ffd4eef 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-017-A"
-             name="1158-noname-imports-017-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-17-A"
+             name="1158-noname-imports-17-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-017-A"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-17-A"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-test.xml
index fe3968f6..6f22af82 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-017-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-017-A.dmn</modelName>
+    <modelName>1158-noname-imports-17-A.dmn</modelName>
 
     <!--
     Model A imports itself.
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-A.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-A.dmn
similarity index 89%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-A.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-A.dmn
index 85f21f6a..117582df 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-A.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-A"
-             name="1158-noname-imports-018-A"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-A"
+             name="1158-noname-imports-18-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-B.dmn
similarity index 82%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-B.dmn
index 6e4bf677..188805c0 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-009-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-B.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-B"
-             name="1158-noname-imports-009-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-B"
+             name="1158-noname-imports-18-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-009-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-C"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-C.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-C.dmn
similarity index 87%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-C.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-C.dmn
index 48f774d8..cbf995d4 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-C.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-C.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-C"
-             name="1158-noname-imports-018-C"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-C"
+             name="1158-noname-imports-18-C"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-B"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-18-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-test.xml
index 08820618..a7dddcd8 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-018-A.dmn</modelName>
+    <modelName>1158-noname-imports-18-A.dmn</modelName>
 
     <!--
     Model A imports B, B imports C, C imports B.
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-A.dmn
similarity index 82%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-A.dmn
index c8b559ed..06899b02 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-018-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-A.dmn
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-B"
-             name="1158-noname-imports-018-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-19-A"
+             name="1158-noname-imports-19-A"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
-    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-018-C"
+    <import namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-19-B"
             name=""
             importType="https://www.omg.org/spec/DMN/20230324/MODEL/"
     />
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-B.dmn b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-B.dmn
similarity index 90%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-B.dmn
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-B.dmn
index fd2302b3..9c625657 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-B.dmn
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-B.dmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-019-B"
-             name="1158-noname-imports-019-B"
+<definitions namespace="http://www.montera.com.au/spec/DMN/1158-noname-imports-19-B"
+             name="1158-noname-imports-19-B"
              id="_i9fboPUUEeesLuP4RHs4vA"
              xmlns="https://www.omg.org/spec/DMN/20230324/MODEL/"
 >
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-test.xml
similarity index 94%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-test.xml
index 3ea4aefa..9c18c968 100644
--- a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-019-test.xml
+++ b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-test.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation=""
            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <modelName>1158-noname-imports-019-A.dmn</modelName>
+    <modelName>1158-noname-imports-19-A.dmn</modelName>
 
     <!--
     Model A is empty and imports a decision and input data from model B.  The test case