diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.txt b/compiler/testData/diagnostics/tests/recovery/namelessInJava.txt
index acea0b00e1f..b78661ae8b5 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.txt
@@ -12,7 +12,7 @@ public final class K : p.Nameless {
 package p {
 
     public open class Nameless {
-        public/*package*/ constructor Nameless()
+        public constructor Nameless()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.txt b/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.txt
index bb5675eb71e..add798d9a0e 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.txt
+++ b/compiler/testData/javac/diagnostics/tests/imports/ClassImportsConflicting.txt
@@ -5,7 +5,7 @@ package a {
     public abstract class a {
         public constructor a()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open fun getO(): O!
+        public open fun getO(): b.O!
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -32,12 +32,12 @@ package c {
 }
 
 package d {
-    public fun test(): O!
+    public fun test(): b.O!
 
     public final class A : a.a {
         public constructor A()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun getO(): O!
+        public open override /*1*/ /*fake_override*/ fun getO(): b.O!
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.txt b/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.txt
index 8eafd6bd017..cf907efc3dd 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.txt
+++ b/compiler/testData/javac/diagnostics/tests/imports/NestedAndTopLevelClassClash.txt
@@ -25,13 +25,13 @@ package a {
 }
 
 package b {
-    public fun test(): B!
+    public fun test(): a.B!
     public fun test2(): B!
 
     public open class A1 {
         public constructor A1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open fun getB(): B!
+        public open fun getB(): a.B!
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.txt b/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.txt
index d415a9f8988..a1dd1a20b79 100644
--- a/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.txt
+++ b/compiler/testData/javac/diagnostics/tests/imports/NestedClassClash.txt
@@ -32,13 +32,13 @@ package a {
 }
 
 package b {
-    public fun test(): B!
+    public fun test(): a.A.B!
     public fun test2(): B!
 
     public open class A1 {
         public constructor A1()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open fun getB(): B!
+        public open fun getB(): a.A.B!
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }