diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/addImport.kt b/idea/testData/quickfix/supertypeInitialization/addImport.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/addImport.kt
rename to idea/testData/quickfix/supertypeInitialization/addImport.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/addImport.kt.after b/idea/testData/quickfix/supertypeInitialization/addImport.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/addImport.kt.after
rename to idea/testData/quickfix/supertypeInitialization/addImport.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/addParameters.kt b/idea/testData/quickfix/supertypeInitialization/addParameters.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/addParameters.kt
rename to idea/testData/quickfix/supertypeInitialization/addParameters.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/addParameters.kt.after b/idea/testData/quickfix/supertypeInitialization/addParameters.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/addParameters.kt.after
rename to idea/testData/quickfix/supertypeInitialization/addParameters.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/createConstructor.kt b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/createConstructor.kt
rename to idea/testData/quickfix/supertypeInitialization/createConstructor.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/createConstructor.kt.after b/idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/createConstructor.kt.after
rename to idea/testData/quickfix/supertypeInitialization/createConstructor.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/genericClass.kt b/idea/testData/quickfix/supertypeInitialization/genericClass.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/genericClass.kt
rename to idea/testData/quickfix/supertypeInitialization/genericClass.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/genericClass.kt.after b/idea/testData/quickfix/supertypeInitialization/genericClass.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/genericClass.kt.after
rename to idea/testData/quickfix/supertypeInitialization/genericClass.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/incompleteConstructor.kt b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/incompleteConstructor.kt
rename to idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/incompleteConstructor.kt.after b/idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/incompleteConstructor.kt.after
rename to idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/keywordName.kt b/idea/testData/quickfix/supertypeInitialization/keywordName.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/keywordName.kt
rename to idea/testData/quickfix/supertypeInitialization/keywordName.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/keywordName.kt.after b/idea/testData/quickfix/supertypeInitialization/keywordName.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/keywordName.kt.after
rename to idea/testData/quickfix/supertypeInitialization/keywordName.kt.after
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/noParameters.kt b/idea/testData/quickfix/supertypeInitialization/noParameters.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/noParameters.kt
rename to idea/testData/quickfix/supertypeInitialization/noParameters.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/primaryConstructorInaccessible.kt b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/primaryConstructorInaccessible.kt
rename to idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt
diff --git a/idea/testData/quickfix/addConstructorParametersFromSuper/primaryConstructorInaccessible.kt.after b/idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after
similarity index 100%
rename from idea/testData/quickfix/addConstructorParametersFromSuper/primaryConstructorInaccessible.kt.after
rename to idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 951b97fbc0e..8ec2bea4761 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -176,63 +176,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         }
     }
 
-    @TestMetadata("idea/testData/quickfix/addConstructorParametersFromSuper")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class AddConstructorParametersFromSuper extends AbstractQuickFixTest {
-        @TestMetadata("addImport.kt")
-        public void testAddImport() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/addImport.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("addParameters.kt")
-        public void testAddParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/addParameters.kt");
-            doTest(fileName);
-        }
-
-        public void testAllFilesPresentInAddConstructorParametersFromSuper() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addConstructorParametersFromSuper"), Pattern.compile("^(\\w+)\\.kt$"), true);
-        }
-
-        @TestMetadata("createConstructor.kt")
-        public void testCreateConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/createConstructor.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("genericClass.kt")
-        public void testGenericClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/genericClass.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("incompleteConstructor.kt")
-        public void testIncompleteConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/incompleteConstructor.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("keywordName.kt")
-        public void testKeywordName() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/keywordName.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("noParameters.kt")
-        public void testNoParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/noParameters.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("primaryConstructorInaccessible.kt")
-        public void testPrimaryConstructorInaccessible() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addConstructorParametersFromSuper/primaryConstructorInaccessible.kt");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("idea/testData/quickfix/addStarProjections")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -4004,10 +3947,58 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SupertypeInitialization extends AbstractQuickFixTest {
+        @TestMetadata("addImport.kt")
+        public void testAddImport() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addImport.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("addParameters.kt")
+        public void testAddParameters() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParameters.kt");
+            doTest(fileName);
+        }
+
         public void testAllFilesPresentInSupertypeInitialization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^(\\w+)\\.kt$"), true);
         }
 
+        @TestMetadata("createConstructor.kt")
+        public void testCreateConstructor() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/createConstructor.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("genericClass.kt")
+        public void testGenericClass() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/genericClass.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("incompleteConstructor.kt")
+        public void testIncompleteConstructor() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("keywordName.kt")
+        public void testKeywordName() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/keywordName.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("noParameters.kt")
+        public void testNoParameters() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/noParameters.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("primaryConstructorInaccessible.kt")
+        public void testPrimaryConstructorInaccessible() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("supertypeNotInitialized.kt")
         public void testSupertypeNotInitialized() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/supertypeNotInitialized.kt");