diff --git a/compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderLazyBodiesTestCaseGenerated.java b/compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderLazyBodiesTestCaseGenerated.java
index 3eeef1dfd60..63b3ad9c245 100644
--- a/compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderLazyBodiesTestCaseGenerated.java
+++ b/compiler/fir/raw-fir/psi2fir/tests-gen/org/jetbrains/kotlin/fir/builder/RawFirBuilderLazyBodiesTestCaseGenerated.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
 @TestMetadata("compiler/fir/raw-fir/psi2fir/testData/rawBuilder")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-public class RawFirBuilderLazyBodiesTestCaseGenerated extends AbstractRawFirBuilderLazyBodiesTestCase {
+    public class RawFirBuilderLazyBodiesTestCaseGenerated extends AbstractRawFirBuilderLazyBodiesTestCase {
     private void runTest(String testDataFilePath) throws Exception {
         KotlinTestUtils.runTest(this::doRawFirTest, this, testDataFilePath);
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt
index 2a998a49f90..7b9c3fdeeed 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/innerDeclarationsResolve/functionWithImplicitType.fir.txt
@@ -2,5 +2,5 @@ FILE: functionWithImplicitType.kt
     public final [BODY_RESOLVE] fun <T> checkSubtype([BODY_RESOLVE] t: R|T|): R|T| {
         ^checkSubtype R|<local>/t|
     }
-    public final [BODY_RESOLVE] val ab: R|kotlin/collections/List<kotlin/Int>?| = R|/checkSubtype|<R|kotlin/collections/List<kotlin/Int>?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|ft<kotlin/Int, kotlin/Int?>!|>())
+    public final [BODY_RESOLVE] val ab: R|kotlin/collections/List<kotlin/Int>?| = R|/checkSubtype|<R|kotlin/collections/List<kotlin/Int>?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|ft<kotlin/Int, kotlin/Int?>|>())
         [BODY_RESOLVE] public get(): R|kotlin/collections/List<kotlin/Int>?|
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
index 579e34f42c2..53b5a0096ad 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
@@ -6,7 +6,7 @@ FILE: delegates.kt
         R|/variableWithImplicitType| = Int(10)
     }
     public final [STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+    public final [BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
         private [BODY_RESOLVE] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
@@ -20,13 +20,13 @@ FILE: delegates.kt
 
     }
 
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
     public final [STATUS] val valueWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
         [STATUS] public get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
     public final [STATUS] var variableWithExplicitType: R|kotlin/Int|by LAZY_EXPRESSION
@@ -36,10 +36,10 @@ FILE: delegates.kt
         [STATUS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        [IMPLICIT_TYPES_BODY_RESOLVE] public set([IMPLICIT_TYPES_BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public set([BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
             D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
index 389bdce4d79..16d2d691fe0 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
@@ -3,6 +3,6 @@ FILE: topLevelFunctionsWithImplicitType.kt
         R|/receive|(R|/functionWithLazyBody|())
     }
     public final [STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
diff --git a/idea/testData/fir/lazyResolve/elvis/main.txt b/idea/testData/fir/lazyResolve/elvis/main.txt
index 9cb8d8909ca..92856ceab57 100644
--- a/idea/testData/fir/lazyResolve/elvis/main.txt
+++ b/idea/testData/fir/lazyResolve/elvis/main.txt
@@ -1,10 +1,10 @@
 FILE: main.kt
-    public final [CONTRACTS] class WithElvis : R|kotlin/Any| {
-        public [CONTRACTS] constructor([STATUS] value: R|kotlin/String?|): R|elvis/WithElvis| {
+    public final [STATUS] class WithElvis : R|kotlin/Any| {
+        public [STATUS] constructor([STATUS] value: R|kotlin/String?|): R|elvis/WithElvis| {
             super<R|kotlin/Any|>()
         }
 
-        public final [CONTRACTS] val value: R|kotlin/String?| = R|<local>/value|
+        public final [STATUS] val value: R|kotlin/String?| = R|<local>/value|
             [STATUS] public get(): R|kotlin/String?|
 
         public final [BODY_RESOLVE] fun foo(): R|kotlin/String| {
diff --git a/idea/testData/fir/lazyResolve/inSecondary/main.txt b/idea/testData/fir/lazyResolve/inSecondary/main.txt
index 573a5070e95..9ef8fc78fca 100644
--- a/idea/testData/fir/lazyResolve/inSecondary/main.txt
+++ b/idea/testData/fir/lazyResolve/inSecondary/main.txt
@@ -1,6 +1,6 @@
 FILE: main.kt
-    public final [CONTRACTS] class Foo : R|kotlin/Any| {
-        public final [CONTRACTS] val x: R|kotlin/Int|
+    public final [STATUS] class Foo : R|kotlin/Any| {
+        public final [STATUS] val x: R|kotlin/Int|
             [STATUS] public get(): R|kotlin/Int|
 
         public [BODY_RESOLVE] constructor(): R|Foo| {
diff --git a/idea/testData/fir/lazyResolve/simple/callMe.txt b/idea/testData/fir/lazyResolve/simple/callMe.txt
index a10ead431de..197994dc886 100644
--- a/idea/testData/fir/lazyResolve/simple/callMe.txt
+++ b/idea/testData/fir/lazyResolve/simple/callMe.txt
@@ -1,5 +1,5 @@
 FILE: callMe.kt
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] fun callMe(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] fun callMe(): R|kotlin/Int| {
         ^callMe Int(42)
     }
     public final [STATUS] fun other(): R|kotlin/Unit| { LAZY_BLOCK }
diff --git a/idea/testData/fir/lazyResolve/simple/main.txt b/idea/testData/fir/lazyResolve/simple/main.txt
index f68a9fa1b1d..38128708ace 100644
--- a/idea/testData/fir/lazyResolve/simple/main.txt
+++ b/idea/testData/fir/lazyResolve/simple/main.txt
@@ -7,6 +7,6 @@ FILE: main.kt
     public final [STATUS] fun foo(): R|kotlin/Unit| {
         [RAW_FIR] lval y: <implicit> = Double(2.0)
     }
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] fun bar([IMPLICIT_TYPES_BODY_RESOLVE] x: R|kotlin/Int|, [IMPLICIT_TYPES_BODY_RESOLVE] y: R|kotlin/Int|): R|kotlin/Int| {
+    public final [BODY_RESOLVE] fun bar([BODY_RESOLVE] x: R|kotlin/Int|, [BODY_RESOLVE] y: R|kotlin/Int|): R|kotlin/Int| {
         ^bar R|<local>/x|.R|kotlin/Int.plus|(R|<local>/y|)
     }
diff --git a/idea/testData/fir/lazyResolve/simpleProperty/myProperty.txt b/idea/testData/fir/lazyResolve/simpleProperty/myProperty.txt
index db3f86429d4..a8abe551add 100644
--- a/idea/testData/fir/lazyResolve/simpleProperty/myProperty.txt
+++ b/idea/testData/fir/lazyResolve/simpleProperty/myProperty.txt
@@ -1,5 +1,5 @@
 FILE: myProperty.kt
-    public final [IMPLICIT_TYPES_BODY_RESOLVE] val myProperty: R|kotlin/Int|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] val myProperty: R|kotlin/Int|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ Int(42)
         }