diff --git a/idea/testData/quickfix/checkArguments/invokeOnString.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/invokeOnString.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt
diff --git a/idea/testData/quickfix/checkArguments/invokeOnString.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/invokeOnString.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt.after
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt
diff --git a/idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt.after b/idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt.after
similarity index 100%
rename from idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt.after
rename to idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index 1bd019e4967..71e13cfd705 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -309,6 +309,16 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         }
     }
 
+    @TestMetadata("idea/testData/quickfix/checkArguments")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class CheckArguments extends AbstractQuickFixMultiFileTest {
+        public void testAllFilesPresentInCheckArguments() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
+        }
+
+    }
+
     @TestMetadata("idea/testData/quickfix/createFromUsage")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 88a5ba274c1..ca40436d516 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -652,53 +652,62 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
         }
 
-        @TestMetadata("invokeOnString.kt")
-        public void testInvokeOnString() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/invokeOnString.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArguments.kt")
-        public void testMixedNamedAndPositionalArguments() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArguments.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArgumentsConstructor.kt")
-        public void testMixedNamedAndPositionalArgumentsConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsConstructor.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArgumentsMultiple.kt")
-        public void testMixedNamedAndPositionalArgumentsMultiple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsMultiple.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArgumentsSubtype.kt")
-        public void testMixedNamedAndPositionalArgumentsSubtype() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsSubtype.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArgumentsUsedNamed.kt")
-        public void testMixedNamedAndPositionalArgumentsUsedNamed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedNamed.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("mixedNamedAndPositionalArgumentsUsedPositional.kt")
-        public void testMixedNamedAndPositionalArgumentsUsedPositional() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/mixedNamedAndPositionalArgumentsUsedPositional.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("nonVarargSpread.kt")
         public void testNonVarargSpread() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/nonVarargSpread.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("idea/testData/quickfix/checkArguments/addNameToArgument")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class AddNameToArgument extends AbstractQuickFixTest {
+            public void testAllFilesPresentInAddNameToArgument() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments/addNameToArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
+            }
+
+            @TestMetadata("invokeOnString.kt")
+            public void testInvokeOnString() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArguments.kt")
+            public void testMixedNamedAndPositionalArguments() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArgumentsConstructor.kt")
+            public void testMixedNamedAndPositionalArgumentsConstructor() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArgumentsMultiple.kt")
+            public void testMixedNamedAndPositionalArgumentsMultiple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArgumentsSubtype.kt")
+            public void testMixedNamedAndPositionalArgumentsSubtype() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArgumentsUsedNamed.kt")
+            public void testMixedNamedAndPositionalArgumentsUsedNamed() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("mixedNamedAndPositionalArgumentsUsedPositional.kt")
+            public void testMixedNamedAndPositionalArgumentsUsedPositional() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt");
+                doTest(fileName);
+            }
+        }
     }
 
     @TestMetadata("idea/testData/quickfix/conflictingImports")