diff --git a/idea/idea-completion/testData/smart/functionReference/1.kt b/idea/idea-completion/testData/smart/callableReference/1.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/1.kt
rename to idea/idea-completion/testData/smart/callableReference/1.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/10.kt b/idea/idea-completion/testData/smart/callableReference/10.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/10.kt
rename to idea/idea-completion/testData/smart/callableReference/10.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/11.kt.disabled b/idea/idea-completion/testData/smart/callableReference/11.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/11.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/11.kt.disabled
diff --git a/idea/idea-completion/testData/smart/functionReference/12.kt b/idea/idea-completion/testData/smart/callableReference/12.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/12.kt
rename to idea/idea-completion/testData/smart/callableReference/12.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/2.kt.todo b/idea/idea-completion/testData/smart/callableReference/2.kt.todo
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/2.kt.todo
rename to idea/idea-completion/testData/smart/callableReference/2.kt.todo
diff --git a/idea/idea-completion/testData/smart/functionReference/3.kt b/idea/idea-completion/testData/smart/callableReference/3.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/3.kt
rename to idea/idea-completion/testData/smart/callableReference/3.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/4.kt b/idea/idea-completion/testData/smart/callableReference/4.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/4.kt
rename to idea/idea-completion/testData/smart/callableReference/4.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/5.kt.disabled b/idea/idea-completion/testData/smart/callableReference/5.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/5.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/5.kt.disabled
diff --git a/idea/idea-completion/testData/smart/functionReference/6.kt.disabled b/idea/idea-completion/testData/smart/callableReference/6.kt.disabled
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/6.kt.disabled
rename to idea/idea-completion/testData/smart/callableReference/6.kt.disabled
diff --git a/idea/idea-completion/testData/smart/functionReference/7.kt b/idea/idea-completion/testData/smart/callableReference/7.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/7.kt
rename to idea/idea-completion/testData/smart/callableReference/7.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/8.kt.todo b/idea/idea-completion/testData/smart/callableReference/8.kt.todo
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/8.kt.todo
rename to idea/idea-completion/testData/smart/callableReference/8.kt.todo
diff --git a/idea/idea-completion/testData/smart/functionReference/9.kt b/idea/idea-completion/testData/smart/callableReference/9.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/9.kt
rename to idea/idea-completion/testData/smart/callableReference/9.kt
diff --git a/idea/idea-completion/testData/smart/functionReference/AfterQualifier.kt b/idea/idea-completion/testData/smart/callableReference/AfterQualifier.kt
similarity index 100%
rename from idea/idea-completion/testData/smart/functionReference/AfterQualifier.kt
rename to idea/idea-completion/testData/smart/callableReference/AfterQualifier.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 62c38a69ed7..e2bcddf1e07 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
@@ -581,6 +581,63 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
         }
     }
 
+    @TestMetadata("idea/idea-completion/testData/smart/callableReference")
+    @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("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");
+            doTest(fileName);
+        }
+
+        public void testAllFilesPresentInCallableReference() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+    }
+
     @TestMetadata("idea/idea-completion/testData/smart/constructor")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -812,63 +869,6 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
         }
     }
 
-    @TestMetadata("idea/idea-completion/testData/smart/functionReference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class FunctionReference extends AbstractJvmSmartCompletionTest {
-        @TestMetadata("1.kt")
-        public void test1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/1.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("10.kt")
-        public void test10() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/10.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("12.kt")
-        public void test12() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/12.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("3.kt")
-        public void test3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/3.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("4.kt")
-        public void test4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/4.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("7.kt")
-        public void test7() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/7.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("9.kt")
-        public void test9() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/9.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("AfterQualifier.kt")
-        public void testAfterQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionReference/AfterQualifier.kt");
-            doTest(fileName);
-        }
-
-        public void testAllFilesPresentInFunctionReference() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/functionReference"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-    }
-
     @TestMetadata("idea/idea-completion/testData/smart/generics")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)