diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirPhaseUpdater.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirPhaseUpdater.kt
index 80886e0a806..193cc87ee41 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirPhaseUpdater.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirPhaseUpdater.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve
 
+import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isScriptStatement
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirElementWithResolveState
 import org.jetbrains.kotlin.fir.declarations.*
@@ -19,7 +20,7 @@ internal object LLFirPhaseUpdater {
     ) {
         updatePhaseForNonLocals(target, newPhase, isTargetDeclaration = true)
 
-        if (updateForLocalDeclarations && target is FirCallableDeclaration) {
+        if (updateForLocalDeclarations) {
             when (target) {
                 is FirFunction -> target.body?.accept(PhaseUpdatingTransformer, newPhase)
                 is FirVariable -> {
@@ -28,6 +29,14 @@ internal object LLFirPhaseUpdater {
                     target.setter?.body?.accept(PhaseUpdatingTransformer, newPhase)
                     target.backingField?.accept(PhaseUpdatingTransformer, newPhase)
                 }
+
+                is FirScript -> {
+                    target.parameters.forEach { it.accept(PhaseUpdatingTransformer, newPhase) }
+                    for (statement in target.statements) {
+                        if (!statement.isScriptStatement) continue
+                        statement.accept(PhaseUpdatingTransformer, newPhase)
+                    }
+                }
             }
         }
     }
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
index c474a60bf0e..2999c1d6fda 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fir.references.FirSuperReference
 import org.jetbrains.kotlin.fir.references.FirThisReference
 import org.jetbrains.kotlin.fir.references.builder.buildExplicitSuperReference
 import org.jetbrains.kotlin.fir.references.builder.buildExplicitThisReference
+import org.jetbrains.kotlin.fir.resolve.ResolutionMode
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.dfa.FirControlFlowGraphReferenceImpl
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveTransformer
@@ -37,6 +38,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractsDslNa
 import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.resolve.dfa.cfg.isUsedInControlFlowGraphBuilderForClass
+import org.jetbrains.kotlin.fir.visitors.transformSingle
 
 internal object LLFirBodyLazyResolver : LLFirLazyResolver(FirResolvePhase.BODY_RESOLVE) {
     override fun resolve(
@@ -142,7 +144,7 @@ private class LLFirBodyTargetResolver(
             is FirField -> resolve(target, BodyStateKeepers.FIELD)
             is FirVariable -> resolve(target, BodyStateKeepers.VARIABLE)
             is FirAnonymousInitializer -> resolve(target, BodyStateKeepers.ANONYMOUS_INITIALIZER)
-            is FirScript,
+            is FirScript -> resolve(target, BodyStateKeepers.SCRIPT)
             is FirDanglingModifierList,
             is FirFileAnnotationsContainer,
             is FirTypeAlias,
@@ -152,6 +154,22 @@ private class LLFirBodyTargetResolver(
             else -> throwUnexpectedFirElementError(target)
         }
     }
+
+    override fun rawResolve(target: FirElementWithResolveState) {
+        if (target !is FirScript) return super.rawResolve(target)
+
+        transformer.declarationsTransformer.withScript(target) {
+            target.parameters.forEach { it.transformSingle(transformer, ResolutionMode.ContextIndependent) }
+            target.statements.forEach {
+                if (it.isScriptStatement) {
+                    transformer.firResolveContextCollector?.addStatementContext(it, transformer.context)
+                    it.transformSingle(transformer, ResolutionMode.ContextIndependent)
+                }
+            }
+
+            target
+        }
+    }
 }
 
 internal object BodyStateKeepers {
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt
index d8d929c38c8..5766d1aa1b4 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt
@@ -196,7 +196,9 @@ val FirDeclaration.isGeneratedDeclaration
 
 internal inline fun FirScript.forEachDeclaration(action: (FirDeclaration) -> Unit) {
     for (statement in statements) {
-        if (statement !is FirDeclaration || statement.origin is FirDeclarationOrigin.ScriptCustomization) continue
-        action(statement)
+        if (statement.isScriptStatement) continue
+        action(statement as FirDeclaration)
     }
 }
+
+internal val FirStatement.isScriptStatement: Boolean get() = this !is FirDeclaration || origin is FirDeclarationOrigin.ScriptCustomization
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
index e2487372a0c..72b4a297fd1 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] classMemberPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
index fcda2f10ecd..8813fcecac0 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] classScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
index 8b8caadcfcc..f92c866569e 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] constructorsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int|): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
index 0ca91af05ef..953266b4ea8 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] danglingAnnotationClassLevelScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Foo : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Foo| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
index 418718f5a41..737ffb26fd1 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] declarationsInPropertyInitScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
index 6beefc96289..0ce22e146d0 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum<A>| {
             private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
index e198e06749e..b923bae4392 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassWithBodyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum<A>| {
             private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
index 85c664a24f9..be849b15c22 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] initBlockScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
index 83e64cf6493..c8b7cd6e16f 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun a(): R|kotlin/Unit| {
             local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
index 8e8a1009297..b06c5dacda9 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localFunScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
             local final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Unit| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
index 02753fb3574..358e1817132 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
             [ResolvedTo(BODY_RESOLVE)] lvar x: R|kotlin/Int|
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
index a431abd681e..d8f0c78b3b5 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
index c6f46a97dcc..0a2b5a0a97c 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
index 59c6e80e5dd..397f03974b4 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] propertyAccessorsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(10)
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
index db0c1aa6152..0f4487af87f 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Builder| {
@@ -26,19 +26,19 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             ^build2 R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
         public final [ResolvedTo(BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
@@ -47,6 +47,6 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
         )
             public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
index fe2228c963f..f36b5d7d4e7 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] init: R|A.() -> kotlin/Unit|): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
index eec1ece5dc7..07049b6da58 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
             ^foo Int(42)
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
index 0d190c893c5..fa18aa9cd15 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithoutTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
             ^foo Int(42)
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
index 155775255d3..521b865674d 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelFunWithTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
             <Unresolved name: println>#(String())
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
index d4d4ee1a11e..769ad2147ba 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
index 6d9f7c3962e..51593b63be2 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelUnitFunScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
             <Unresolved name: println>#(String())
diff --git a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
index fc6382ebee3..dbcd7475e82 100644
--- a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
+++ b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] withoutNameScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <no name provided>([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| {
             ^<no name provided> String(str)
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
index 26cb0e07870..6a5b75b6b86 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt
@@ -9,20 +9,20 @@ FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentOnStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @Target[Unresolved](AnnotationTarget#.EXPRESSION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public final? [ResolvedTo(RAW_FIR)] annotation class Annotation : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Annotation.name] name: String): R|Annotation| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val name: String = R|<local>/name|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] get(): String
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|<local>/name|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String|
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun x(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Annotation[Unresolved](String(y)) x#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = @R|Annotation|[Types](name = String(y)) R|/x|()
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
index 5b996982618..427ddfcd461 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/statementAnnotation.txt
@@ -3,16 +3,16 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@Suppress[Unresolved](String())
+@R|kotlin/Suppress|[Types](names = vararg(String()))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statementAnnotation.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Suppress[Unresolved](String()) foo#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = @R|kotlin/Suppress|[Types](names = vararg(String())) R|/foo|()
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
index 7199afcdbd4..d4b53e3f4c6 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/compoundAssignOnVarScript.txt
@@ -5,22 +5,22 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var i: R|kotlin/Int| = Int(1)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit|
 
-    +=(i#, IntegerLiteral(1))
+    +=(R|/i|, Int(1))
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVarScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var i: R|kotlin/Int| = Int(1)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit|
 
-        +=(i#, IntegerLiteral(1))
\ No newline at end of file
+        +=(R|/i|, Int(1))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
index cb16558b400..7ae28b1b3be 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt
@@ -1,82 +1,47 @@
 KT element: KtArrayAccessExpression
-FIR element: FirScriptImpl
+FIR element: FirResolvedNamedReferenceImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-    public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
-            super<R|kotlin/Any|>()
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
-        }
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
-        }
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
-        }
-
-    }
-
-    public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
-
-    public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
-        [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
-        [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
-        [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
-        R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
-        R|<local>/<unary>|
-    }
-
-        public [ResolvedTo(RAW_FIR)] get(): <implicit>
+R|test/B.set|
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setOperatorScript.kts
     package test
 
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
+        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=test/B.n] n: R|kotlin/Int|): R|test/B| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val n: R|kotlin/Int| = R|<local>/n|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=B] get(): R|kotlin/Int|
 
-            public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
+            public final operator [ResolvedTo(CONTRACTS)] fun set([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] a: R|test/B|): R|kotlin/Unit| {
             }
 
-            public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
+            public final operator [ResolvedTo(CONTRACTS)] fun get([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|test/B| {
             }
 
-            public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
+            public final operator [ResolvedTo(CONTRACTS)] fun inc(): R|test/B| {
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var a: R|test/B| = R|test/B.B|(Int(1))
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|test/B|
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|test/B|): R|kotlin/Unit|
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
-            [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
-            [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
-            [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
-            R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|test/B| =  {
+            [ResolvedTo(BODY_RESOLVE)] lval <array>: R|test/B| = R|test/a|
+            [ResolvedTo(BODY_RESOLVE)] lval <index_0>: R|kotlin/Int| = Int(2)
+            [ResolvedTo(BODY_RESOLVE)] lval <unary>: R|test/B| = R|<local>/<array>|.R|test/B.get|(R|<local>/<index_0>|)
+            R|<local>/<array>|.R|test/B.set|(R|<local>/<index_0>|, R|<local>/<unary>|.R|test/B.inc|())
             R|<local>/<unary>|
         }
 
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
\ No newline at end of file
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|test/B|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
index 12d507a4f2d..af180d98a48 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt
@@ -9,47 +9,47 @@ FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignment.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        builder#.execute#()
-        builder#.version# = String()
\ No newline at end of file
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
index 5ebeed08a94..c843261375b 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt
@@ -3,53 +3,53 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-execute#()
+this@R|special/anonymous|.R|/Builder.execute|()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        builder#.execute#()
-        builder#.version# = String()
\ No newline at end of file
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
index 32a1aa61016..2fdc6bbb12e 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt
@@ -3,24 +3,24 @@ FIR element: FirVariableAssignmentImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-builder#.version# = String()
+R|/builder|.<Unresolved name: version># = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
@@ -33,30 +33,30 @@ FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        builder#.execute#()
-        builder#.version# = String()
\ No newline at end of file
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
index 59376d9f09b..3ab350a8fa9 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt
@@ -5,18 +5,18 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+        public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
             println#(version#)
         }
 
@@ -29,50 +29,50 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)]
 
     }
 
-    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-        ^build Builder#().apply#(action#)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
     }
 
-    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(123)
-        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+        this@R|special/anonymous|.R|/Builder.version| = String(123)
+        local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
             }
 
         }
 
-        execute#()
+        this@R|special/anonymous|.R|/Builder.execute|()
     }
     )
-    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(321)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+        <Unresolved name: version># = String(321)
     }
     )
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-    builder#.execute#()
-    builder#.version# = String()
+    R|/builder|.<Unresolved name: execute>#()
+    R|/builder|.<Unresolved name: version># = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
@@ -85,30 +85,30 @@ FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        builder#.execute#()
-        builder#.version# = String()
\ No newline at end of file
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
index 3e87046dcf8..a99d1fed857 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt
@@ -5,18 +5,18 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+        public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
             println#(version#)
         }
 
@@ -29,50 +29,50 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)]
 
     }
 
-    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-        ^build Builder#().apply#(action#)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
     }
 
-    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(123)
-        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+        this@R|special/anonymous|.R|/Builder.version| = String(123)
+        local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
             }
 
         }
 
-        execute#()
+        this@R|special/anonymous|.R|/Builder.execute|()
     }
     )
-    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(321)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+        <Unresolved name: version># = String(321)
     }
     )
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-    builder#.execute#()
-    builder#.version# = String()
+    R|/builder|.<Unresolved name: execute>#()
+    R|/builder|.<Unresolved name: version># = String()
 
 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
@@ -85,30 +85,30 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>
 
-        builder#.execute#()
-        builder#.version# = String()
\ No newline at end of file
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
index 68228e39fa0..3abfb983973 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt
@@ -704,7 +704,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
index 4b6d627cc5d..3b75c03f31c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
index 36e6735b420..4da477a5083 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt
@@ -444,7 +444,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
index 87509bed3c4..8a93f109669 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt
@@ -613,7 +613,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class X : R|kotlin/Enum<X>| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt
index f38fc69e420..2ac037b345a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Number|> : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Number|>([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.value] value: <ERROR TYPE REF: Symbol not found for KClass>): R|one/Anno<T>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
index a5d58e6f4f1..caa22c6ec57 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt
@@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
     [ResolvedTo(BODY_RESOLVE)] annotations container
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
index eec998ee6f3..3d380b58555 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameter2Script.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
index c1f4bc4c01f..9bfcb0f83f4 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
index d63a51da4a0..1b3749098c0 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/anonymousFunctionWithAnnotatedParameterScript.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
index 380d46ed065..ce7376d0f32 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classMembersScript.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
index fe7f3e5dc94..357a47fe358 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTargetScript.txt
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
index c2f627e8050..6f63171769c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParametersScript.txt
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class ResolveMe<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K>(): R|ResolveMe<T, K>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
index ce555757caa..8eb217b16f0 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClassScript.txt
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(BODY_RESOLVE)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Value] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
index 217388b5868..2625a8bbd85 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
index 70dfa919f97..baf277f1842 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
index c0bbbfef73d..945dedd8772 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
index 9b9e459f1fd..cd75b0a2870 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
index e870cc5ef94..137f9bb5d7b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
index edb46db3bf4..b5ff1816878 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassScript.txt
@@ -457,7 +457,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
index bef7c308a33..e7ede700ac0 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverridesScript.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface OV : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] val originalExpressions: R|A|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2Script.txt
index b4085207049..971e20249a3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2Script.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverrideScript.txt
index 7bcf6547184..b5c2c1ee45b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverrideScript.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
index aca3dd9b327..2833f6c087c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClassScript.txt
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(BODY_RESOLVE)] class LocalClass : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
index 0a652b6da05..17ca1080e1a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
index 34b728c848f..000201c7da8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
index a836de08e00..7d842c6a37a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnFunctionScript.txt
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
index f5cbe41148c..07dfbad57f8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyDelegateScript.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
index d1d97f17d28..d73220e9bf8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationsOnPropertyScript.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
index 5fc771a81dd..22dec62b023 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchyScript.txt
@@ -444,7 +444,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface NonLocalInterface : R|kotlin/Any| {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
index 40f1499b4b5..7b32a2ebb4b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclarationScript.txt
@@ -1718,7 +1718,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public sealed [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             protected [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2Script.txt
index 73717de3fda..689e2b77fd2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2Script.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface ResolveMe : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /E> {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3Script.txt
index 9d9ee4c9c0e..dc5dfe4579a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3Script.txt
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchyScript.txt
index 4e389598fac..01cafc93b09 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchyScript.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2Script.txt
index ff409327cc0..400470f1264 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2Script.txt
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchyScript.txt
index 0042f9d248b..f183f76cee8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchyScript.txt
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
index 8178edd1b62..1f98b4f3771 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopyScript.txt
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final data [ResolvedTo(BODY_RESOLVE)] class DataClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
index 4ede05bdf83..5b2eca06086 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2Script.txt
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final data [ResolvedTo(BODY_RESOLVE)] class DataClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegateWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegateWithImplicitTypeScript.txt
index 282e4b36dc6..c36cd87dafa 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/delegateWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegateWithImplicitTypeScript.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Aaa] constructor([ResolvedTo(BODY_RESOLVE)] i: R|Interface|): R|Aaa| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
index d0929764ef6..d9a00eea702 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedFieldScript.txt
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Boo : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegatesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegatesScript.txt
index 27ca9bc0fc6..45377dcce96 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/delegatesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegatesScript.txt
@@ -769,7 +769,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: valueWithExplicitType>#)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
index a7336a63efd..626fc910a55 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntriesScript.txt
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
index c12e3423b05..2581edaa360 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntryScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor(): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
index 9ccb34b81bb..c27cbd261e9 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOfScript.txt
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
index 101663a2167..ae229264289 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValuesScript.txt
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverrideScript.txt
index 229a546b4e0..3d6b51d5561 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverrideScript.txt
@@ -756,7 +756,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun expression([ResolvedTo(BODY_RESOLVE)] expression: R|IrConst<*>|): R|kotlin/Unit| {
             when ([ResolvedTo(BODY_RESOLVE)] lval kind: R|Kind<out kotlin/Any?>| = R|<local>/expression|.R|SubstitutionOverride</IrConst.kind: R|Kind<CapturedType(*)>|>|) {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
index 9f1bf789e1b..e9c0e23cbcc 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructorScript.txt
@@ -223,7 +223,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Problem : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotationsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotationsScript.txt
index 7d76efe6064..f0cb677c690 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotationsScript.txt
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
     [ResolvedTo(BODY_RESOLVE)] annotations container
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
index 998c77b6ae3..d3125f514c7 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuterScript.txt
@@ -691,7 +691,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
index f7d35a522be..196d5a0dc9d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameterScript.txt
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface I : R|kotlin/Any| {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
index a7ca2bc62c5..f28f9180754 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript.txt
@@ -319,7 +319,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
             [R|Contract description]
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
index 5ff0fd8a133..0bc13942b88 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/contractScript2.txt
@@ -302,7 +302,7 @@ BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
             [Contract description] <
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
             [R|Contract description]
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
index 5c1205fc868..dceaf43806f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResultScript.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class Foo<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
index 099de3a2da2..f3525e8ab6a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameterScript.txt
@@ -145,7 +145,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int|): R|kotlin/String| {
             ^foo String(boo)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
index f3c694663da..78bec1bb3db 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInsideScript.txt
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class Foo<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
index 7eb796ce3e6..e3dbd62027d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParametersScript.txt
@@ -132,7 +132,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> resolveMe(): R|kotlin/Unit| {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
index 47167a56d80..c4dfa723495 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
index 84e6e9711f4..f84c2fdabf7 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
index d0dbb2877ee..b589d23c094 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
index d151b84894a..14f19324345 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2Script.txt
index 8f8858e6ea3..89c794a925f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2Script.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverrideScript.txt
index 7f571ba7202..a2481a98317 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverrideScript.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
index 3f9062479d5..95cd9c0f0df 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterfaceScript.txt
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Arg : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
index b501d854ac6..afe28c684b6 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt
@@ -626,7 +626,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class LazyDelegate<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(BODY_RESOLVE)] T>([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
index 506d52c1290..b9176dacb0a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructorScript.txt
@@ -535,7 +535,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T> magic(): R|T| {
             ^magic Null(null)!!
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
index a7d6eb12908..f2650404ccb 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCallScript.txt
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
index 09e942ceec9..9f1dc2c3f92 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteralScript.txt
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class ClassWithParameter : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(BODY_RESOLVE)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
index 71b23d3c70c..07ceee9531c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplateScript.txt
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class ClassWithParameter : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(BODY_RESOLVE)] s: R|kotlin/String|): R|one/ClassWithParameter| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
index 54a0af27af0..d8a42d3f92e 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStatement.txt
@@ -2,566 +2,566 @@ RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -582,20 +582,20 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStatement.kts
             ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|Builder| = R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|Builder|
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
index 25f66898d06..635a0a95b79 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplateScript.txt
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplateScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class ClassWithParameter : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(BODY_RESOLVE)] s: R|kotlin/String|): R|one/ClassWithParameter| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
index ee974eeb26f..fbedcec7022 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCallScript.txt
@@ -457,7 +457,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Interface : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/String|): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
index ab15b61eb94..754bf986eb3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClassScript.txt
@@ -652,7 +652,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
index 7e05191fbeb..ead1271eb84 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCallScript.txt
@@ -457,7 +457,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Interface : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/String|): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
index d5ff6b2900b..a63c500b604 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMemberScript.txt
@@ -938,7 +938,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMemberScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
index d8b82c6a6a9..d56a07a070b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBodyScript.txt
@@ -639,7 +639,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBodyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
index 91204dce0e2..ced3b1c3797 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsScript.txt
@@ -938,7 +938,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
index 9735c1add6a..7282471e5d8 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2Script.txt
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class OuterClass<[ResolvedTo(BODY_RESOLVE)] T1> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(BODY_RESOLVE)] T1>(): R|OuterClass<T1>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAliasScript.txt
index 38f4205d7e7..3480ccb93af 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAliasScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedTypeAliasScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class OuterClass<[ResolvedTo(BODY_RESOLVE)] T1> : R|SuperForOuter| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(BODY_RESOLVE)] T1>(): R|OuterClass<T1>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
index c81eababe7e..7d776fee7fb 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetterScript.txt
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
index d543a9959f1..90efde1a0a3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetterScript.txt
@@ -171,7 +171,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(2)
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
index 99fd89db473..cbc922128d3 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameterScript.txt
@@ -236,7 +236,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int| = Int(1), [ResolvedTo(BODY_RESOLVE)] c: R|kotlin/Long|): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
index e53a7052738..a1a99e5a6c6 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorPropertyScript.txt
@@ -275,7 +275,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
index 5662b567e1a..6dcc6c95389 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorScript.txt
@@ -223,7 +223,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Problem : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/getterWithDelegationScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/getterWithDelegationScript.txt
index d37627b1138..74dc683b87c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/getterWithDelegationScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/getterWithDelegationScript.txt
@@ -301,7 +301,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] getterWithDelegationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val one: R|kotlin/Int|by R|/Prp.Prp|()
             @R|kotlin/Deprecated|[Types](message = String(reason)) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
index 71d94ec9bf6..804a725e365 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2Script.txt
@@ -1094,7 +1094,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
index 94de3d9b5f0..0be87d0270d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3Script.txt
@@ -1094,7 +1094,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
index c6d85301cf0..6a5a896a3fc 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4Script.txt
@@ -1133,7 +1133,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
index 55df517604d..0d77f8f920a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClassScript.txt
@@ -1094,7 +1094,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
index 24b2f35e7af..173348ec575 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideScript.txt
@@ -522,7 +522,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
index d2274d3c1d3..52b94a4590a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBodyScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBodyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
index 855b266c96e..d331ab289e5 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
index 4d90d7b8f28..f944b4b758c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitTypeScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
index f11911447ac..14aef9ecd29 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetterScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertySetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] var prop: R|kotlin/Int| = Int(42)
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
index 465f6feb71c..d4843c64b1b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParametersScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> R|T|.resolveMe: R|K|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|K| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2Script.txt
index 27ff614a8a5..3413557bf77 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2Script.txt
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverrideScript.txt
index f799c60543c..6c035b63083 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverrideScript.txt
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
             public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
index e076abffafc..58feee2c270 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetterScript.txt
@@ -301,7 +301,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: withGetterAndSetter>#)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
index 99bf52c29f0..6f3c0b98a83 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterScript.txt
@@ -249,7 +249,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithGetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: withGetter>#)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
index de209dcc0a9..5239fc05955 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializerScript.txt
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] propertyWithInitializerScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: property>#)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
index 4bb4918cff9..8b970e95a66 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/redeclarationScript.txt
@@ -275,7 +275,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
index 82405f9ca33..fdac0c2f96d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClassScript.txt
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class UnusedClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
index 9cd1d0aef69..c0eb5b0aef7 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructorScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class UnusedClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
index abbe756076b..69306e5ba72 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunctionScript.txt
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class UnusedClass : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
index 0a8f05f21a4..d6757fc290f 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script.txt
@@ -914,83 +914,83 @@ BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            @R|Anno|[Types](Q|En|.R|/En.Entry|) public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] enum class En : R|kotlin/Enum<En>| {
-            private [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] constructor(): R|En| {
+        public final [ResolvedTo(STATUS)] enum class En : R|kotlin/Enum<En>| {
+            private [ResolvedTo(STATUS)] [ContainingClassKey=En] constructor(): R|En| {
                 super<R|kotlin/Enum<En>|>()
             }
 
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] enum entry Entry: R|En|
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
+            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] enum entry Entry: R|En|
+            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun values(): R|kotlin/Array<En>| {
             }
 
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|En| {
+            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|En| {
             }
 
-            public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
-                public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries<En>|
+            public final static [ResolvedTo(STATUS)] [ContainingClassKey=En] val entries: R|kotlin/enums/EnumEntries<En>|
+                public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<En>|
 
         }
 
-        @Target[Unresolved](AnnotationTarget#.EXPRESSION#, AnnotationTarget#.FUNCTION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: En): R|Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|En|): R|Anno| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: En = R|<local>/s|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): En
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|En| = R|<local>/s|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|En|
 
         }
 
-        @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(BODY_RESOLVE)] fun doo([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        @Anno[Unresolved](En#.Entry#) builder#.execute#()
-        builder#.version# = String()
+        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -1038,19 +1038,19 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
             ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        @Anno[Unresolved](En#.Entry#) build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                @Anno[Unresolved](En#.Entry#) public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                @R|Anno|[Types](s = Q|En|.R|/En.Entry|) public final [ResolvedTo(BODY_RESOLVE)] fun doo([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
         public final [ResolvedTo(BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
@@ -1059,5 +1059,5 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
         )
             public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        @Anno[Unresolved](En#.Entry#) builder#.execute#()
-        builder#.version# = String()
+        @R|Anno|[Types](s = Q|En|.R|/En.Entry|) R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
index 3fee9588735..c7c09813933 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script2.txt
@@ -590,7 +590,7 @@ BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] fun f([ResolvedTo(RAW_FIR)] p: Int?): Int {
             [ResolvedTo(RAW_FIR)] lval fy: <implicit> = p#!!
@@ -598,11 +598,11 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
             ^f fz#
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun consume([ResolvedTo(RAW_FIR)] x: Int): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun consume([ResolvedTo(CONTRACTS)] x: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val x: Int? = IntegerLiteral(1)
-            public? [ResolvedTo(RAW_FIR)] get(): Int?
+        public final [ResolvedTo(CONTRACTS)] val x: R|kotlin/Int?| = IntegerLiteral(1)
+            public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int?|
 
         public? final? [ResolvedTo(RAW_FIR)] val y: <implicit> = x#!!
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
@@ -614,9 +614,9 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
             ^foo x#.plus#(IntegerLiteral(1))
         }
 
-        consume#(x#.plus#(IntegerLiteral(1)))
-        x#!!
-        consume#(x#.plus#(IntegerLiteral(1)))
+        R|/consume|(R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1)))
+        R|/x|!!
+        R|/consume|(R|/x|.R|kotlin/Int.plus|(Int(1)))
         public? final? [ResolvedTo(RAW_FIR)] val zz: <implicit> = x#.plus#(IntegerLiteral(1))
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
@@ -638,8 +638,8 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] script2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun f([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/Int?|): R|kotlin/Int| {
             [ResolvedTo(BODY_RESOLVE)] lval fy: R|kotlin/Int| = R|<local>/p|!!
@@ -663,9 +663,9 @@ FILE: [ResolvedTo(IMPORTS)] script2.kts
             ^foo <Unresolved name: x>#.<Ambiguity: plus, [kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus]>#(Int(1))
         }
 
-        consume#(x#.plus#(IntegerLiteral(1)))
-        x#!!
-        consume#(x#.plus#(IntegerLiteral(1)))
+        R|/consume|(R|/x|.R|kotlin/Int.plus<Inapplicable(UNSAFE_CALL): kotlin/Int.plus>#|(Int(1)))
+        R|/x|!!
+        R|/consume|(R|/x|.R|kotlin/Int.plus|(Int(1)))
         public final [ResolvedTo(BODY_RESOLVE)] val zz: <ERROR TYPE REF: Ambiguity: plus, [kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus]> = <Unresolved name: x>#.<Ambiguity: plus, [kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus]>#(Int(1))
             public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: plus, [kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus]>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script3.kts b/analysis/low-level-api-fir/testdata/lazyResolve/script3.kts
new file mode 100644
index 00000000000..50a3a2c1797
--- /dev/null
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script3.kts
@@ -0,0 +1,24 @@
+// RESOLVE_SCRIPT
+
+class UnusedClass {
+    var version: String = ""
+
+    fun execute() {
+        println(version)
+    }
+}
+
+fun unusedFunction() = 4
+fun build(action: () -> Unit) {}
+var unusedVariable = 4
+var variable = "str"
+
+build {
+    class A {
+        fun doo(i: Int) {
+
+        }
+    }
+}
+
+variable = "1"
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/script3.txt b/analysis/low-level-api-fir/testdata/lazyResolve/script3.txt
new file mode 100644
index 00000000000..0f55d6e2b77
--- /dev/null
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/script3.txt
@@ -0,0 +1,713 @@
+RAW_FIR:
+FILE: [ResolvedTo(RAW_FIR)] script3.kts
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(RAW_FIR)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+IMPORTS:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(RAW_FIR)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+COMPILER_REQUIRED_ANNOTATIONS:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+COMPANION_GENERATION:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(COMPANION_GENERATION)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+SUPER_TYPES:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
+    SCRIPT: [ResolvedTo(SUPER_TYPES)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+TYPES:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+STATUS:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(STATUS)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+EXPECT_ACTUAL_MATCHING:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(EXPECT_ACTUAL_MATCHING)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+ARGUMENTS_OF_ANNOTATIONS:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+CONTRACTS:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(CONTRACTS)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+IMPLICIT_TYPES_BODY_RESOLVE:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+ANNOTATIONS_ARGUMENTS_MAPPING:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)]
+        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( () -> Unit )): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public? final? [ResolvedTo(RAW_FIR)] var variable: <implicit> = String(str)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
+            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public? final? [ResolvedTo(RAW_FIR)] fun doo([ResolvedTo(RAW_FIR)] i: Int): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        variable# = String(1)
+
+BODY_RESOLVE:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| {
+            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] get(): String
+                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+
+            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+                println#(version#)
+            }
+
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] fun unusedFunction(): <implicit> {
+            ^unusedFunction IntegerLiteral(4)
+        }
+
+        public final [ResolvedTo(CONTRACTS)] fun build([ResolvedTo(CONTRACTS)] action: R|() -> kotlin/Unit|): R|kotlin/Unit| {
+        }
+
+        public? final? [ResolvedTo(RAW_FIR)] var unusedVariable: <implicit> = IntegerLiteral(4)
+            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var variable: R|kotlin/String| = String(str)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String|
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit|
+
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=kotlin/Function0<kotlin/Unit>] build@fun <anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        R|/variable| = String(1)
+
+FILE RAW TO BODY:
+FILE: [ResolvedTo(IMPORTS)] script3.kts
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
+
+        public final [ResolvedTo(BODY_RESOLVE)] class UnusedClass : R|kotlin/Any| {
+            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] constructor(): R|UnusedClass| {
+                super<R|kotlin/Any|>()
+            }
+
+            public final [ResolvedTo(BODY_RESOLVE)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] get(): R|kotlin/String|
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=UnusedClass] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit|
+
+            public final [ResolvedTo(BODY_RESOLVE)] fun execute(): R|kotlin/Unit| {
+                R|kotlin/io/println|(this@R|/UnusedClass|.R|/UnusedClass.version|)
+            }
+
+        }
+
+        public final [ResolvedTo(BODY_RESOLVE)] fun unusedFunction(): R|kotlin/Int| {
+            ^unusedFunction Int(4)
+        }
+
+        public final [ResolvedTo(BODY_RESOLVE)] fun build([ResolvedTo(BODY_RESOLVE)] action: R|() -> kotlin/Unit|): R|kotlin/Unit| {
+        }
+
+        public final [ResolvedTo(BODY_RESOLVE)] var unusedVariable: R|kotlin/Int| = Int(4)
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
+            public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit|
+
+        public final [ResolvedTo(BODY_RESOLVE)] var variable: R|kotlin/String| = String(str)
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
+            public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit|
+
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=kotlin/Function0<kotlin/Unit>] build@fun <anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
+                    super<R|kotlin/Any|>()
+                }
+
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|kotlin/Unit| {
+                }
+
+            }
+
+        }
+        )
+        R|/variable| = String(1)
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
index 00f1b83b6c8..12f71da406d 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameterScript.txt
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42), [ResolvedTo(BODY_RESOLVE)] c: R|kotlin/String|): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
index 35411b8efc7..1310ff1d695 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorScript.txt
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(R|/A.A|(Int(42)))
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt b/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
index 757e0f75ad2..d73129c5301 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/statement.txt
@@ -2,644 +2,644 @@ RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)]
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|
 
-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                 println#(version#)
             }
 
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -660,19 +660,19 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts
             ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
         }
 
-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                 }
 
             }
 
-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
         }
         )
         public final [ResolvedTo(BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
@@ -681,5 +681,5 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts
         )
             public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
index eb7eee1c679..3cd8b9fbd5a 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/statement2.txt
@@ -2,7 +2,7 @@ RAW_FIR:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -23,21 +23,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -58,21 +58,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -93,21 +93,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -128,21 +128,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -163,21 +163,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -198,21 +198,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -233,21 +233,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -268,21 +268,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -303,21 +303,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -338,21 +338,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -373,21 +373,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -408,21 +408,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -443,21 +443,21 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
             ^build Builder#().apply#(action#)
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]> = <Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
         }
         )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] statement2.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] constructor(): R|Builder| {
@@ -484,6 +484,6 @@ FILE: [ResolvedTo(IMPORTS)] statement2.kts
         )
             public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Ambiguity: build, [kotlin/collections/build, kotlin/collections/build, kotlin/collections/build]>
 
-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideScript.txt
index b182d0b780e..07c86e0963e 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideScript.txt
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] class SubClass : R|AbstractClass<kotlin/Int>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
index 15db1c6d212..0097744a3ec 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/substitutionFakeOverrideWithImplicitTypeScript.txt
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public abstract [ResolvedTo(BODY_RESOLVE)] class SubClass : R|AbstractClass<kotlin/Int>| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|SubClass| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoopScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoopScript.txt
index 25ab30fd41b..a104da64a47 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoopScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoopScript.txt
@@ -457,7 +457,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] superTypesLoopScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class resolveMe : R|C| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
index a7b438bf323..265988db4af 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesScript.txt
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] superTypesScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public open [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
index bbd836d55f1..ba2efd35fcf 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsScript.txt
@@ -236,7 +236,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: functionWithLazyBody>#())
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
index 8ded8f502e7..64c2893892b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.txt
@@ -236,7 +236,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: functionWithLazyBody>#())
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
index 822da101c9d..f64ca4a55e6 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitTypeScript.txt
@@ -236,7 +236,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
             <Unresolved name: receive>#(<Unresolved name: functionWithLazyBody>#())
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
index 3c4d608a478..bc563660cb1 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParametersScript.txt
@@ -119,7 +119,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParametersScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] typealias ResolveMe<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> = R|kotlin/collections/Map<T, K>|
 
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
index a69b4b36e3c..654ec5bbf9e 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBoundsScript.txt
@@ -275,7 +275,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterBoundsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] foo: R|Foo|): R|kotlin/Unit| {
             R|<local>/foo|.<Unresolved name: util>#()
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
index be2c7de71ce..acf20d145da 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass2Script.txt
@@ -275,7 +275,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass2Script.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass<[ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(BODY_RESOLVE)] Type>(): R|MyClass<Type>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
index 246886ec4b1..b3ed4dffb7c 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClassScript.txt
@@ -223,7 +223,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfClassScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class MyClass<[ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(BODY_RESOLVE)] Type>(): R|MyClass<Type>| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
index 6d640cdf670..78d42863a3b 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunctionScript.txt
@@ -223,7 +223,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
index a6d31e5782e..5add5072403 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunctionScript.txt
@@ -132,7 +132,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunctionScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] resolveMe> ddd(): R|kotlin/Unit| {
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
index 230e491b1d3..2df9e8b3ed2 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetterScript.txt
@@ -158,7 +158,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] val <[ResolvedTo(BODY_RESOLVE)] Type> R|Type|.x: R|kotlin/Int|
             public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
index 68bbd124e9c..c5482bb42f6 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAliasScript.txt
@@ -210,7 +210,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAliasScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
     SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|
 
         public final [ResolvedTo(BODY_RESOLVE)] class X<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor<[ResolvedTo(BODY_RESOLVE)] T>(): R|X<T>| {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirScriptLazyDeclarationResolveTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirScriptLazyDeclarationResolveTestGenerated.java
index 094df2d945e..4285fc16cbd 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirScriptLazyDeclarationResolveTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/FirScriptLazyDeclarationResolveTestGenerated.java
@@ -426,6 +426,12 @@ public class FirScriptLazyDeclarationResolveTestGenerated extends AbstractFirScr
         runTest("analysis/low-level-api-fir/testdata/lazyResolve/script2.kts");
     }
 
+    @Test
+    @TestMetadata("script3.kts")
+    public void testScript3() throws Exception {
+        runTest("analysis/low-level-api-fir/testdata/lazyResolve/script3.kts");
+    }
+
     @Test
     @TestMetadata("secondaryConstructorParameterScript.kts")
     public void testSecondaryConstructorParameterScript() throws Exception {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
index 07eb003e1fc..a3703ef34a9 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
@@ -525,15 +525,19 @@ open class FirDeclarationsResolveTransformer(
             }
         }
 
-    override fun transformScript(script: FirScript, data: ResolutionMode): FirScript {
+    fun withScript(script: FirScript, action: () -> FirScript): FirScript {
         dataFlowAnalyzer.enterScript(script)
         val result = context.withScopesForScript(script, components) {
-            transformDeclarationContent(script, data) as FirScript
+            action()
         }
         dataFlowAnalyzer.exitScript() // TODO: FirScript should be a FirControlFlowGraphOwner, KT-59683
         return result
     }
 
+    override fun transformScript(script: FirScript, data: ResolutionMode): FirScript = withScript(script) {
+        transformDeclarationContent(script, data) as FirScript
+    }
+
     override fun transformCodeFragment(codeFragment: FirCodeFragment, data: ResolutionMode): FirCodeFragment {
         dataFlowAnalyzer.enterCodeFragment(codeFragment)
         context.withScopesForCodeFragment(codeFragment, components) {