diff --git a/idea/testData/checker/ForRangeConventions.fir.kt b/idea/testData/checker/ForRangeConventions.fir.kt
index 0869b6f6708..f050136c594 100644
--- a/idea/testData/checker/ForRangeConventions.fir.kt
+++ b/idea/testData/checker/ForRangeConventions.fir.kt
@@ -68,10 +68,10 @@ abstract class Range1() {
 }
 
 fun test(notRange1: NotRange1, notRange2: NotRange2, notRange3: NotRange3, notRange4: NotRange4, notRange5: NotRange5, notRange6: NotRange6, notRange7: NotRange7, range0: Range0, range1: Range1) {
-  <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: iterator"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (i in notRange1)</error></error></error>;
-  <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (i in notRange2)</error></error>;
-  <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (i in notRange3)</error>;
-  <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext">for (i in notRange4)</error>;
+  for (i in <error descr="[ITERATOR_MISSING] ">notRange1</error>);
+  for (i in <error descr="[HAS_NEXT_MISSING] "><error descr="[NEXT_MISSING] ">notRange2</error></error>);
+  for (i in <error descr="[NEXT_MISSING] ">notRange3</error>);
+  for (i in <error descr="[HAS_NEXT_MISSING] ">notRange4</error>);
   for (i in notRange5);
   for (i in notRange6);
   for (i in notRange7);
diff --git a/idea/testData/checker/Unresolved.fir.kt b/idea/testData/checker/Unresolved.fir.kt
index 1cc971d3c58..618aff349ed 100644
--- a/idea/testData/checker/Unresolved.fir.kt
+++ b/idea/testData/checker/Unresolved.fir.kt
@@ -23,11 +23,11 @@ fun testUnresolved() {
         else -> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: a">a</error>
     }
 
-    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (j in <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: collection">collection</error>) {
+    for (j in <error descr="[ITERATOR_MISSING] "><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: collection">collection</error></error>) {
        var i: Int = j
        i += 1
        foo1(j)
-    }</error></error>
+    }
 }
 
 fun foo1(i: Int) {}
diff --git a/idea/testData/checker/infos/SmartCasts.fir.kt b/idea/testData/checker/infos/SmartCasts.fir.kt
index 2fe868ece94..503884ed227 100644
--- a/idea/testData/checker/infos/SmartCasts.fir.kt
+++ b/idea/testData/checker/infos/SmartCasts.fir.kt
@@ -266,7 +266,7 @@ fun inForLoop(x: Any?) {
     if (x is Array<*>) {
         for (i in x) {}
     }
-    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: iterator"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for (i in x) {}</error></error></error>
+    for (i in <error descr="[ITERATOR_MISSING] ">x</error>) {}
 }
 
 class ExplicitAccessorForAnnotation {
diff --git a/idea/testData/checker/regression/BadParseForClass.fir.kt b/idea/testData/checker/regression/BadParseForClass.fir.kt
index b5c10ec1907..7bc6e38a364 100644
--- a/idea/testData/checker/regression/BadParseForClass.fir.kt
+++ b/idea/testData/checker/regression/BadParseForClass.fir.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    String.<error descr="[EXPRESSION_REQUIRED] ">class</error><EOLError descr="Name expected"></EOLError>
+    String.<error descr="[EXPRESSION_EXPECTED] ">class</error><EOLError descr="Name expected"></EOLError>
 }
 
 // EA-56152: An attempt to build light class in checker to get diagnotics
diff --git a/idea/testData/checker/regression/ClassDeclarationAfterDot.fir.kt b/idea/testData/checker/regression/ClassDeclarationAfterDot.fir.kt
index dc8b1ecafa5..34a5fc57e6a 100644
--- a/idea/testData/checker/regression/ClassDeclarationAfterDot.fir.kt
+++ b/idea/testData/checker/regression/ClassDeclarationAfterDot.fir.kt
@@ -1,5 +1,5 @@
 class A
 
 fun f() {
-    A.<error descr="[EXPRESSION_REQUIRED] ">class</error><EOLError descr="Name expected"></EOLError>
+    A.<error descr="[EXPRESSION_EXPECTED] ">class</error><EOLError descr="Name expected"></EOLError>
 }
diff --git a/idea/testData/checker/regression/ClassDeclarationAsExpression.fir.kt b/idea/testData/checker/regression/ClassDeclarationAsExpression.fir.kt
index dc96e6568ab..fad2f2397de 100644
--- a/idea/testData/checker/regression/ClassDeclarationAsExpression.fir.kt
+++ b/idea/testData/checker/regression/ClassDeclarationAsExpression.fir.kt
@@ -1,4 +1,4 @@
-val p = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_REQUIRED] ">class A {
+val p = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_EXPECTED] ">class A {
     fun f() {
         f()
     }
diff --git a/idea/testData/checker/regression/ClassDeclarationAsExpression2.fir.kt b/idea/testData/checker/regression/ClassDeclarationAsExpression2.fir.kt
index 88bc55d4cc7..d564a56395e 100644
--- a/idea/testData/checker/regression/ClassDeclarationAsExpression2.fir.kt
+++ b/idea/testData/checker/regression/ClassDeclarationAsExpression2.fir.kt
@@ -1 +1 @@
-fun g() = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_REQUIRED] ">class A</error>
+fun g() = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_EXPECTED] ">class A</error>
diff --git a/idea/testData/checker/regression/ClassDeclarationAsExpression3.fir.kt b/idea/testData/checker/regression/ClassDeclarationAsExpression3.fir.kt
index d6da5c8f0a6..3b9047e1d78 100644
--- a/idea/testData/checker/regression/ClassDeclarationAsExpression3.fir.kt
+++ b/idea/testData/checker/regression/ClassDeclarationAsExpression3.fir.kt
@@ -1,4 +1,4 @@
-fun f(i: Int = 3 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_REQUIRED] ">class A {
+fun f(i: Int = 3 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_EXPECTED] ">class A {
     fun f() {
         f()
     }
diff --git a/idea/testData/checker/regression/DescructuringDeclarationInForLoop.fir.kt b/idea/testData/checker/regression/DescructuringDeclarationInForLoop.fir.kt
index 1a53ad4b24d..757402f7983 100644
--- a/idea/testData/checker/regression/DescructuringDeclarationInForLoop.fir.kt
+++ b/idea/testData/checker/regression/DescructuringDeclarationInForLoop.fir.kt
@@ -1,3 +1,3 @@
 fun main() {
-    <error descr="[UNRESOLVED_REFERENCE] Unresolved reference: hasNext"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: iterator"><error descr="[UNRESOLVED_REFERENCE] Unresolved reference: next">for ((i, j)<error descr="Expecting 'in'">)</error> {}</error></error></error>
+    for ((i, j)<error descr="Expecting 'in'">)</error> {}
 }
diff --git a/idea/testData/checker/regression/FunDeclarationAfterDot.fir.kt b/idea/testData/checker/regression/FunDeclarationAfterDot.fir.kt
index 3c49b063207..895b005e8a5 100644
--- a/idea/testData/checker/regression/FunDeclarationAfterDot.fir.kt
+++ b/idea/testData/checker/regression/FunDeclarationAfterDot.fir.kt
@@ -1,7 +1,7 @@
 class A
 
 fun f() {
-    A.<error descr="[EXPRESSION_REQUIRED] ">fun g() {
+    A.<error descr="[ANONYMOUS_FUNCTION_WITH_NAME] ">fun g() {
         g()
     }</error>
 }
diff --git a/idea/testData/checker/regression/InterfaceDeclarationAsExpression.fir.kt b/idea/testData/checker/regression/InterfaceDeclarationAsExpression.fir.kt
index e9984f52ac6..086fccc1251 100644
--- a/idea/testData/checker/regression/InterfaceDeclarationAsExpression.fir.kt
+++ b/idea/testData/checker/regression/InterfaceDeclarationAsExpression.fir.kt
@@ -1,4 +1,4 @@
-val p = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_REQUIRED] ">interface A {
+val p = 1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates: [kotlin/Int.compareTo, kotlin/Int.compareTo, kotlin/Int.compareTo, ...]"><</error> <error descr="[EXPRESSION_EXPECTED] ">interface A {
     fun f() {
         f()
     }