diff --git a/compiler/fir/resolve/testData/diagnostics/callableReferences/implicitTypes.txt b/compiler/fir/resolve/testData/diagnostics/callableReferences/implicitTypes.txt
index 72b99e9ca86..5f6e2cb1f70 100644
--- a/compiler/fir/resolve/testData/diagnostics/callableReferences/implicitTypes.txt
+++ b/compiler/fir/resolve/testData/diagnostics/callableReferences/implicitTypes.txt
@@ -8,7 +8,7 @@ FILE: implicitTypes.kt
     public final fun bar(x: R|kotlin/String|): R|kotlin/Int| {
         ^bar Int(1)
     }
-    public final fun loop1(): <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/use]> {
+    public final fun loop1(): <ERROR TYPE REF: Empty diagnostic> {
         ^loop1 <Inapplicable(INAPPLICABLE): [/use]>#(::loop2#)
     }
     public final fun loop2(): <ERROR TYPE REF: cycle> {
diff --git a/compiler/fir/resolve/testData/diagnostics/j+k/MyException.txt b/compiler/fir/resolve/testData/diagnostics/j+k/MyException.txt
index dad4eeb6c3d..3b0b82f75ea 100644
--- a/compiler/fir/resolve/testData/diagnostics/j+k/MyException.txt
+++ b/compiler/fir/resolve/testData/diagnostics/j+k/MyException.txt
@@ -8,15 +8,15 @@ FILE: test.kt
     public final fun test(e: R|MyException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/printStackTrace|()
         R|<local>/e|.R|kotlin/printStackTrace|(R|<local>/stream|)
-        lval result: <ERROR TYPE REF: Unresolved name: getLocalizedMessage> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
+        lval result: <ERROR TYPE REF: Empty diagnostic> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
     }
     public final fun test(e: R|YourException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/printStackTrace|()
         R|<local>/e|.R|kotlin/printStackTrace|(R|<local>/stream|)
-        lval result: <ERROR TYPE REF: Unresolved name: getLocalizedMessage> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
+        lval result: <ERROR TYPE REF: Empty diagnostic> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
     }
     public final fun test(e: R|kotlin/Exception|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/printStackTrace|()
         R|<local>/e|.R|kotlin/printStackTrace|(R|<local>/stream|)
-        lval result: <ERROR TYPE REF: Unresolved name: getLocalizedMessage> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
+        lval result: <ERROR TYPE REF: Empty diagnostic> = R|<local>/e|.<Unresolved name: getLocalizedMessage>#()
     }
diff --git a/compiler/fir/resolve/testData/diagnostics/j+k/MyIterable.txt b/compiler/fir/resolve/testData/diagnostics/j+k/MyIterable.txt
index b10f1123687..f39203c2115 100644
--- a/compiler/fir/resolve/testData/diagnostics/j+k/MyIterable.txt
+++ b/compiler/fir/resolve/testData/diagnostics/j+k/MyIterable.txt
@@ -2,11 +2,11 @@ FILE: test.kt
     public abstract interface UseIterable : R|MyIterable<kotlin/String>| {
         public open fun test(): R|kotlin/Unit| {
             lval it: R|kotlin/collections/MutableIterator<kotlin/String>| = this@R|kotlin/collections/MutableIterable|.R|FakeOverride<kotlin/collections/MutableIterable.iterator: R|kotlin/collections/MutableIterator<kotlin/String>|>|()
-            lval split: <ERROR TYPE REF: Unresolved name: spliterator> = <Unresolved name: spliterator>#()
+            lval split: <ERROR TYPE REF: Empty diagnostic> = <Unresolved name: spliterator>#()
         }
 
     }
     public final fun test(some: R|kotlin/collections/Iterable<kotlin/String>|): R|kotlin/Unit| {
         lval it: R|kotlin/collections/Iterator<kotlin/String>| = R|<local>/some|.R|FakeOverride<kotlin/collections/Iterable.iterator: R|kotlin/collections/Iterator<kotlin/String>|>|()
-        lval split: <ERROR TYPE REF: Unresolved name: spliterator> = R|<local>/some|.<Unresolved name: spliterator>#()
+        lval split: <ERROR TYPE REF: Empty diagnostic> = R|<local>/some|.<Unresolved name: spliterator>#()
     }
diff --git a/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.kt b/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.kt
index e3a1282f9da..8a28c2722b0 100644
--- a/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.kt
+++ b/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.kt
@@ -10,7 +10,7 @@ fun test(map: MyMap) {
     val otherResult = map.getOrDefault("key", "value")
     val anotherResult = map.replace("key", "value")
     // Java forEach
-    map.forEach { key, value ->
+    map.<!INAPPLICABLE_CANDIDATE!>forEach<!> { key, value ->
         println("$key: $value")
     }
     // Kotlin forEach
@@ -25,7 +25,7 @@ fun test(map: MutableMap<String, String>) {
     val otherResult = map.getOrDefault("key", "value")
     val anotherResult = map.replace("key", "value")
     // Java forEach
-    map.forEach { key, value ->
+    map.<!INAPPLICABLE_CANDIDATE!>forEach<!> { key, value ->
         println("$key: $value")
     }
     // Kotlin forEach
diff --git a/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.txt b/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.txt
index 212bffd2edf..5a8d9accb41 100644
--- a/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.txt
+++ b/compiler/fir/resolve/testData/diagnostics/j+k/MyMap.txt
@@ -5,9 +5,9 @@ FILE: test.kt
         }
         )
         lval otherResult: R|kotlin/String| = R|<local>/map|.R|FakeOverride<kotlin/collections/Map.getOrDefault: R|kotlin/String|>|(String(key), String(value))
-        lval anotherResult: <ERROR TYPE REF: Unresolved name: replace> = R|<local>/map|.<Unresolved name: replace>#(String(key), String(value))
-        R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String|, R|kotlin/String|>(<L> = forEach@fun <anonymous>(key: R|kotlin/collections/Map.Entry<kotlin/String, kotlin/String>|, value: R|kotlin/Any?|): R|kotlin/Unit| <kind=UNKNOWN>  {
-            R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
+        lval anotherResult: <ERROR TYPE REF: Empty diagnostic> = R|<local>/map|.<Unresolved name: replace>#(String(key), String(value))
+        R|<local>/map|.<Inapplicable(INAPPLICABLE): [kotlin/collections/forEach]>#(<L> = forEach@fun <implicit>.<anonymous>(key: <implicit>, value: <implicit>): <implicit> {
+            println#(<strcat>(key#, String(: ), value#))
         }
         )
         R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String|, R|kotlin/String|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<kotlin/String, kotlin/String>|): R|kotlin/Unit| <kind=UNKNOWN>  {
@@ -23,9 +23,9 @@ FILE: test.kt
         }
         )
         lval otherResult: R|kotlin/String| = R|<local>/map|.R|FakeOverride<kotlin/collections/Map.getOrDefault: R|kotlin/String|>|(String(key), String(value))
-        lval anotherResult: <ERROR TYPE REF: Unresolved name: replace> = R|<local>/map|.<Unresolved name: replace>#(String(key), String(value))
-        R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String|, R|kotlin/String|>(<L> = forEach@fun <anonymous>(key: R|kotlin/collections/Map.Entry<kotlin/String, kotlin/String>|, value: R|kotlin/Any?|): R|kotlin/Unit| <kind=UNKNOWN>  {
-            R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
+        lval anotherResult: <ERROR TYPE REF: Empty diagnostic> = R|<local>/map|.<Unresolved name: replace>#(String(key), String(value))
+        R|<local>/map|.<Inapplicable(INAPPLICABLE): [kotlin/collections/forEach]>#(<L> = forEach@fun <implicit>.<anonymous>(key: <implicit>, value: <implicit>): <implicit> {
+            println#(<strcat>(key#, String(: ), value#))
         }
         )
         R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String|, R|kotlin/String|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<kotlin/String, kotlin/String>|): R|kotlin/Unit| <kind=UNKNOWN>  {