diff --git a/idea/idea-completion/testData/smart/callableReference/AfterQualifier.kt b/idea/idea-completion/testData/smart/callableReference/AfterDot.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/AfterQualifier.kt
rename to idea/idea-completion/testData/smart/callableReference/AfterDot.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/1.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/1.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/10.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier10.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/10.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier10.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/11.kt.disabled b/idea/idea-completion/testData/smart/callableReference/NoQualifier11.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/11.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier11.kt.disabled
diff --git a/idea/idea-completion/testData/smart/callableReference/12.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier12.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/12.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier12.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/2.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier2.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/2.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier2.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/3.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier3.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/3.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier3.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/4.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier4.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/4.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier4.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/5.kt.disabled b/idea/idea-completion/testData/smart/callableReference/NoQualifier5.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/5.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier5.kt.disabled
diff --git a/idea/idea-completion/testData/smart/callableReference/6.kt.disabled b/idea/idea-completion/testData/smart/callableReference/NoQualifier6.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/6.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier6.kt.disabled
diff --git a/idea/idea-completion/testData/smart/callableReference/7.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier7.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/7.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier7.kt
diff --git a/idea/idea-completion/testData/smart/callableReference/8.kt.todo b/idea/idea-completion/testData/smart/callableReference/NoQualifier8.kt.todo
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/8.kt.todo
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier8.kt.todo
diff --git a/idea/idea-completion/testData/smart/callableReference/9.kt b/idea/idea-completion/testData/smart/callableReference/NoQualifier9.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/callableReference/9.kt
rename to idea/idea-completion/testData/smart/callableReference/NoQualifier9.kt
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java
index f467c3a089b..638644e9efa 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java
@@ -585,63 +585,63 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CallableReference extends AbstractJvmSmartCompletionTest {
-        @TestMetadata("1.kt")
-        public void test1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/1.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("10.kt")
-        public void test10() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/10.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("12.kt")
-        public void test12() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/12.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("2.kt")
-        public void test2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/2.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("3.kt")
-        public void test3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/3.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("4.kt")
-        public void test4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/4.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("7.kt")
-        public void test7() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/7.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("9.kt")
-        public void test9() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/9.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("AfterQualifier.kt")
-        public void testAfterQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/AfterQualifier.kt");
+        @TestMetadata("AfterDot.kt")
+        public void testAfterDot() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/AfterDot.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInCallableReference() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
         }
+
+        @TestMetadata("NoQualifier1.kt")
+        public void testNoQualifier1() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier10.kt")
+        public void testNoQualifier10() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier10.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier12.kt")
+        public void testNoQualifier12() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier12.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier2.kt")
+        public void testNoQualifier2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier2.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier3.kt")
+        public void testNoQualifier3() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier3.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier4.kt")
+        public void testNoQualifier4() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier4.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier7.kt")
+        public void testNoQualifier7() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier7.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoQualifier9.kt")
+        public void testNoQualifier9() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier9.kt");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("idea/idea-completion/testData/smart/constructor")