diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-01.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-01-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-01.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-02.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-02-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-02.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-03.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-03-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-03.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-04.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-04-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-04.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-05.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-05-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-05.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-06.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-06-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-06.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-07.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-07-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-07.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-08.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-08-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-08.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-09.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-09-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-09.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-10.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-10-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-10.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-11.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-11-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-11.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-12.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-12-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-12.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-13.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-13-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-13.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-14.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-14-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-14.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-15.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-15-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-15.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-16.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-16-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-16.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-17.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-17-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-17.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-18.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-18-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-18.xml
diff --git a/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-test.xml b/TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-19.xml
similarity index 100%
rename from TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-19-test.xml
rename to TestCases/compliance-level-3/1158-noname-imports/1158-noname-imports-test-19.xml