diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.2.java b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.2.java
index be5dbfca5c3..e1d8f34da83 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.2.java
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.2.java
@@ -1,11 +1,11 @@
 package client;
 
-import server.KotlintopLevelMethodUsages_0Kt;
+import server.KotlinTopLevelMethodUsages_0Kt;
 
 class JClient {
-    String s = KotlintopLevelMethodUsages_0Kt.processRequest();
+    String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
 
     String sendRequest() {
-        return KotlintopLevelMethodUsages_0Kt.processRequest();
+        return KotlinTopLevelMethodUsages_0Kt.processRequest();
     }
 }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
index 7cbd78b0d95..eaccce829fd 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
@@ -1,7 +1,5 @@
 [kotlinTopLevelMethodUsages.1.kt] Callable reference (6: 23) val methodRef = ::processRequest()
 [kotlinTopLevelMethodUsages.1.kt] Function call (10: 9) processRequest()
 [kotlinTopLevelMethodUsages.1.kt] Usage in import (3: 15) import server.processRequest
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage (6: 30) String s = ServerPackage.processRequest();
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage (9: 30) return ServerPackage.processRequest();
-[kotlinTopLevelMethodUsages.3.java] Unclassified usage (6: 47) String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
-[kotlinTopLevelMethodUsages.3.java] Unclassified usage (9: 47) return KotlinTopLevelMethodUsages_0Kt.processRequest();
\ No newline at end of file
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage (6: 47) String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage (9: 47) return KotlinTopLevelMethodUsages_0Kt.processRequest();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
index 716acf8c4ab..ddcad3e3491 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
@@ -1,9 +1,6 @@
 [kotlinTopLevelPropertyUsages.1.kt] Receiver (8: 35) println("length: ${server.foo.length()}")
 [kotlinTopLevelPropertyUsages.1.kt] Usage in import (3: 15) import server.foo
 [kotlinTopLevelPropertyUsages.1.kt] Value read (7: 33) println("foo = ${server.foo}")
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (7: 53) System.out.println("foo = " + ServerPackage.getFoo());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (8: 55) System.out.println("length: " + ServerPackage.getFoo().length());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (9: 23) ServerPackage.setFoo("");
-[kotlinTopLevelPropertyUsages.3.java] Unclassified usage (7: 72) System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
-[kotlinTopLevelPropertyUsages.3.java] Unclassified usage (8: 74) System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
-[kotlinTopLevelPropertyUsages.3.java] Unclassified usage (9: 42) KotlinTopLevelPropertyUsages_0Kt.setFoo("");
\ No newline at end of file
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (7: 72) System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (8: 74) System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (9: 42) KotlinTopLevelPropertyUsages_0Kt.setFoo("");
\ No newline at end of file
diff --git a/idea/testData/inspections/unusedSymbol/function/usedInJava.java b/idea/testData/inspections/unusedSymbol/function/usedInJava.java
index 4f151f3b1a6..fb1247d707a 100644
--- a/idea/testData/inspections/unusedSymbol/function/usedInJava.java
+++ b/idea/testData/inspections/unusedSymbol/function/usedInJava.java
@@ -1,5 +1,5 @@
 class RandomJavaClass {
     void g() {
-        foo.FooPackage.usedInJava();
+        foo.UsedInJavaKt.usedInJava();
     }
 }
\ No newline at end of file
diff --git a/idea/testData/inspections/unusedSymbol/property/usedInJava.java b/idea/testData/inspections/unusedSymbol/property/usedInJava.java
index fb054707971..009e636245d 100644
--- a/idea/testData/inspections/unusedSymbol/property/usedInJava.java
+++ b/idea/testData/inspections/unusedSymbol/property/usedInJava.java
@@ -1,7 +1,7 @@
 package test;
 
-import foo.FooPackage;
 import foo.Obj;
+import foo.UsedInJavaKt;
 
 class usedInJava {
     public static void main(String[] args) {