From 83bdac8d611a9bfe5b81a1ddfb53a3303cacfefa Mon Sep 17 00:00:00 2001
From: Dmitrii Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 24 Nov 2023 16:01:48 +0100
Subject: [PATCH] [FIR] CustomAnnotationTypeAttribute: drop containerSymbols

Now annotations have the container symbol itself, so this property
is no longer needed.
This migration fixes issues with a missed container symbol, so now
all cases of lazy resolution from KtType are supported

^KT-63042
---
 .../annotations/KtFirAnnotationListForType.kt |   4 +-
 .../classAnnotationsInLocalClass.after.txt    |  12 +-
 .../classAnnotationsInLocalClass.before.txt   |  12 +-
 ...assAnnotationsInLocalClassScript.after.txt |  13 ++-
 ...ssAnnotationsInLocalClassScript.before.txt |  13 ++-
 ...meterTypeCollisionAndAnnotations.after.txt |   6 +-
 ...eterTypeCollisionAndAnnotations.before.txt |   6 +-
 ...ypeCollisionAndAnnotationsScript.after.txt |   6 +-
 ...peCollisionAndAnnotationsScript.before.txt |   6 +-
 .../constructor/call.after.txt                |   2 +-
 .../constructor/call.before.txt               |   2 +-
 .../constructor/callScript.after.txt          |   2 +-
 .../constructor/callScript.before.txt         |   2 +-
 .../constructor/callWithConstructor.after.txt |   2 +-
 .../callWithConstructor.before.txt            |   2 +-
 .../callWithConstructorScript.after.txt       |   2 +-
 .../callWithConstructorScript.before.txt      |   2 +-
 ...delegateFieldWithAnnotationClash.after.txt |  20 ++--
 ...elegateFieldWithAnnotationClash.before.txt |   2 +-
 ...teFieldWithAnnotationClashScript.after.txt |  25 ++--
 ...eFieldWithAnnotationClashScript.before.txt |   3 +-
 .../delegateWithExplicitType.after.txt        |   6 +-
 .../delegateWithExplicitType.before.txt       |   6 +-
 .../delegateWithExplicitTypeScript.after.txt  |   7 +-
 .../delegateWithExplicitTypeScript.before.txt |   7 +-
 ...egateWithExplicitTypeUnavailable.after.txt |   6 +-
 ...gateWithExplicitTypeUnavailable.before.txt |   6 +-
 ...ithExplicitTypeUnavailableScript.after.txt |   7 +-
 ...thExplicitTypeUnavailableScript.before.txt |   7 +-
 .../delegateWithImplicitType.after.txt        |   6 +-
 .../delegateWithImplicitType.before.txt       |   6 +-
 .../delegateWithImplicitTypeScript.after.txt  |   7 +-
 .../delegateWithImplicitTypeScript.before.txt |   7 +-
 ...egateWithImplicitTypeUnavailable.after.txt |   6 +-
 ...gateWithImplicitTypeUnavailable.before.txt |   6 +-
 ...ithImplicitTypeUnavailableScript.after.txt |   7 +-
 ...thImplicitTypeUnavailableScript.before.txt |   7 +-
 .../delegatedFieldNestedName.after.txt        |   2 +-
 .../delegatedFieldNestedName.before.txt       |   2 +-
 ...eldNestedNameClashAndAnnotations.after.txt |  20 ++--
 ...ldNestedNameClashAndAnnotations.before.txt |   2 +-
 ...tedNameClashAndAnnotationsScript.after.txt |  25 ++--
 ...edNameClashAndAnnotationsScript.before.txt |   3 +-
 ...ashWithNestedTypesAndAnnotations.after.txt |   2 +-
 ...shWithNestedTypesAndAnnotations.before.txt |   2 +-
 ...hNestedTypesAndAnnotationsScript.after.txt |   3 +-
 ...NestedTypesAndAnnotationsScript.before.txt |   3 +-
 .../delegatedFieldNestedNameScript.after.txt  |   3 +-
 .../delegatedFieldNestedNameScript.before.txt |   3 +-
 .../delegate/field.after.txt                  |   2 +-
 .../delegate/field.before.txt                 |   2 +-
 .../delegate/fieldScript.after.txt            |   3 +-
 .../delegate/fieldScript.before.txt           |   3 +-
 .../scriptStatementLevel.after.txt            | 110 +++++++++---------
 .../scriptStatementLevel.before.txt           |  96 +++++++--------
 ...iptStatementLevelAsLastStatement.after.txt |  36 +++---
 ...ptStatementLevelAsLastStatement.before.txt |  24 ++--
 .../errorType/errorType.after.txt             |  35 +++---
 .../errorType/errorType.before.txt            |  10 +-
 .../errorType/errorTypeScript.after.txt       |  40 ++++---
 .../errorType/errorTypeScript.before.txt      |  11 +-
 .../errorType/nestedErrorReturnType.after.txt |  10 +-
 .../nestedErrorReturnType.before.txt          |  10 +-
 .../nestedErrorReturnTypeScript.after.txt     |  11 +-
 .../nestedErrorReturnTypeScript.before.txt    |  11 +-
 ...nent1TypeCollisionAndAnnotations.after.txt |  12 +-
 ...ent1TypeCollisionAndAnnotations.before.txt |   6 +-
 ...ypeCollisionAndAnnotationsScript.after.txt |  12 +-
 ...peCollisionAndAnnotationsScript.before.txt |   6 +-
 .../copyTypeCollisionAndAnnotations.after.txt |  22 ++--
 ...copyTypeCollisionAndAnnotations.before.txt |  12 +-
 ...ypeCollisionAndAnnotationsScript.after.txt |  22 ++--
 ...peCollisionAndAnnotationsScript.before.txt |  12 +-
 ...ClashAndAnnotationsAsConstructor.after.txt |   2 +-
 ...lashAndAnnotationsAsConstructor.before.txt |   2 +-
 ...ndAnnotationsAsConstructorScript.after.txt |   2 +-
 ...dAnnotationsAsConstructorScript.before.txt |   2 +-
 ...TypesAndAnnotationsAsConstructor.after.txt |   6 +-
 ...ypesAndAnnotationsAsConstructor.before.txt |   6 +-
 ...ndAnnotationsAsConstructorScript.after.txt |   6 +-
 ...dAnnotationsAsConstructorScript.before.txt |   6 +-
 .../function/explicitType.after.txt           |   6 +-
 .../function/explicitType.before.txt          |   6 +-
 .../function/explicitTypeScript.after.txt     |   7 +-
 .../function/explicitTypeScript.before.txt    |   7 +-
 .../function/generatedComponentN.after.txt    |  12 +-
 .../function/generatedComponentN.before.txt   |   6 +-
 .../generatedComponentNScript.after.txt       |  12 +-
 .../generatedComponentNScript.before.txt      |   6 +-
 .../function/generatedCopy.after.txt          |  22 ++--
 .../function/generatedCopy.before.txt         |  12 +-
 .../function/generatedCopyScript.after.txt    |  22 ++--
 .../function/generatedCopyScript.before.txt   |  12 +-
 .../function/localFunction.after.txt          |  26 ++---
 .../function/localFunction.before.txt         |  26 ++---
 .../localFunctionImplicitType.after.txt       |  12 +-
 .../localFunctionImplicitType.before.txt      |  12 +-
 ...calImplicitTypeUnavailableScript.after.txt |   1 +
 ...alImplicitTypeUnavailableScript.before.txt |   1 +
 .../function/multiDeclaration.after.txt       |  72 ++++++------
 .../function/multiDeclaration.before.txt      |  60 +++++-----
 .../function/multiDeclarationScript.after.txt |  72 ++++++------
 .../multiDeclarationScript.before.txt         |  60 +++++-----
 ...emberFunctionsImplicitBodyScript.after.txt |   1 +
 ...mberFunctionsImplicitBodyScript.before.txt |   1 +
 ...etweenLocalMemberFunctionsScript.after.txt |   1 +
 ...tweenLocalMemberFunctionsScript.before.txt |   1 +
 ...rTypeCallNameClashWithAnnotation.after.txt |  24 ++--
 ...TypeCallNameClashWithAnnotation.before.txt |   4 +-
 ...ithAnnotationImplicitConstructor.after.txt |  24 ++--
 ...thAnnotationImplicitConstructor.before.txt |   4 +-
 ...otationImplicitConstructorScript.after.txt |  29 ++---
 ...tationImplicitConstructorScript.before.txt |   5 +-
 ...allNameClashWithAnnotationScript.after.txt |  29 ++---
 ...llNameClashWithAnnotationScript.before.txt |   5 +-
 ...allNestedNameClashWithAnnotation.after.txt |   4 +-
 ...llNestedNameClashWithAnnotation.before.txt |   4 +-
 ...ithAnnotationImplicitConstructor.after.txt |   4 +-
 ...thAnnotationImplicitConstructor.before.txt |   4 +-
 ...otationImplicitConstructorScript.after.txt |   5 +-
 ...tationImplicitConstructorScript.before.txt |   5 +-
 ...tedNameClashWithAnnotationScript.after.txt |   5 +-
 ...edNameClashWithAnnotationScript.before.txt |   5 +-
 .../typeParameterAnnotations.after.txt        |   6 +-
 .../typeParameterAnnotations.before.txt       |   6 +-
 ...ParameterAnnotationsInLocalClass.after.txt |   6 +-
 ...arameterAnnotationsInLocalClass.before.txt |   6 +-
 ...terAnnotationsInLocalClassScript.after.txt |   7 +-
 ...erAnnotationsInLocalClassScript.before.txt |   7 +-
 .../property/constructorParameter.after.txt   |   6 +-
 .../property/constructorParameter.before.txt  |   6 +-
 .../constructorParameterScript.after.txt      |   6 +-
 .../constructorParameterScript.before.txt     |   7 +-
 .../property/explicitType.after.txt           |   2 +-
 .../property/explicitType.before.txt          |   2 +-
 .../property/explicitTypeScript.after.txt     |   3 +-
 .../property/explicitTypeScript.before.txt    |   3 +-
 ...generatedPropertyFromConstructor.after.txt |  30 ++---
 ...eneratedPropertyFromConstructor.before.txt |  24 ++--
 ...tedPropertyFromConstructorScript.after.txt |  30 ++---
 ...edPropertyFromConstructorScript.before.txt |  24 ++--
 .../localImplicitTypeUnavailable.after.txt    |   2 +-
 .../localImplicitTypeUnavailable.before.txt   |   2 +-
 ...citTypeUnavailableInImplicitBody.after.txt |   2 +-
 ...itTypeUnavailableInImplicitBody.before.txt |   2 +-
 ...eUnavailableInImplicitBodyScript.after.txt |   2 +-
 ...UnavailableInImplicitBodyScript.before.txt |   2 +-
 ...calImplicitTypeUnavailableScript.after.txt |   2 +-
 ...alImplicitTypeUnavailableScript.before.txt |   2 +-
 .../localPropertyWithExplicitType.after.txt   |  18 +--
 .../localPropertyWithExplicitType.before.txt  |  18 +--
 ...tionBetweenLocalMemberProperties.after.txt |   2 +-
 ...ionBetweenLocalMemberProperties.before.txt |   2 +-
 ...ocalMemberPropertiesImplicitBody.after.txt |   2 +-
 ...calMemberPropertiesImplicitBody.before.txt |   2 +-
 ...mberPropertiesImplicitBodyScript.after.txt |   2 +-
 ...berPropertiesImplicitBodyScript.before.txt |   2 +-
 ...tweenLocalMemberPropertiesScript.after.txt |   2 +-
 ...weenLocalMemberPropertiesScript.before.txt |   2 +-
 ...pertyTypeCollisionAndAnnotations.after.txt |  22 ++--
 ...ertyTypeCollisionAndAnnotations.before.txt |  18 +--
 ...ypeCollisionAndAnnotationsScript.after.txt |  22 ++--
 ...peCollisionAndAnnotationsScript.before.txt |  18 +--
 ...terAnnotationsInLocalClassScript.after.txt |   1 +
 ...erAnnotationsInLocalClassScript.before.txt |   1 +
 .../substitutionOverride/function.after.txt   |   6 +-
 .../substitutionOverride/function.before.txt  |   6 +-
 .../functionScript.after.txt                  |   7 +-
 .../functionScript.before.txt                 |   7 +-
 .../functionUnavailable.after.txt             |   6 +-
 .../functionUnavailable.before.txt            |   6 +-
 .../functionUnavailableScript.after.txt       |   7 +-
 .../functionUnavailableScript.before.txt      |   7 +-
 .../implicitFunction.after.txt                |   6 +-
 .../implicitFunction.before.txt               |   6 +-
 .../implicitFunctionScript.after.txt          |   7 +-
 .../implicitFunctionScript.before.txt         |   7 +-
 .../implicitFunctionUnavailable.after.txt     |   8 +-
 .../implicitFunctionUnavailable.before.txt    |   8 +-
 ...mplicitFunctionUnavailableScript.after.txt |   9 +-
 ...plicitFunctionUnavailableScript.before.txt |   9 +-
 .../propertyScript.after.txt                  |   3 +-
 .../propertyScript.before.txt                 |   3 +-
 ...rAndSetterWithExplicitReturnType.after.txt |   4 +-
 ...AndSetterWithExplicitReturnType.before.txt |   4 +-
 .../typeAlias/insideFunctionComplex.after.txt |   6 +-
 .../insideFunctionComplex.before.txt          |   6 +-
 .../insideFunctionComplexScript.after.txt     |   7 +-
 .../insideFunctionComplexScript.before.txt    |   7 +-
 ...WithNestedAnnotationInLocalClass.after.txt |   2 +-
 ...ithNestedAnnotationInLocalClass.before.txt |   2 +-
 ...stedAnnotationInLocalClassScript.after.txt |   3 +-
 ...tedAnnotationInLocalClassScript.before.txt |   3 +-
 .../fir/AbstractLazyTypeAnnotationsTest.kt    |  14 ++-
 .../src/org/jetbrains/kotlin/fir/CopyUtils.kt |   4 +-
 .../providers/impl/FirTypeResolverImpl.kt     |  12 +-
 .../types/CustomAnnotationTypeAttribute.kt    |  33 +-----
 197 files changed, 1044 insertions(+), 1016 deletions(-)

diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt
index eb31fdd1dd3..9dbd0ed5bca 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.toAnnotationClassId
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
+import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.symbols.resolveAnnotationsWithArguments
 import org.jetbrains.kotlin.fir.symbols.resolveAnnotationsWithClassIds
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
@@ -86,7 +87,8 @@ private fun ConeKotlinType.customAnnotationsWithLazyResolve(phase: FirResolvePha
     val custom = attributes.custom ?: return emptyList()
     val annotations = custom.annotations.ifEmpty { return emptyList() }
 
-    for (containerSymbol in custom.containerSymbols) {
+    for (annotation in annotations) {
+        val containerSymbol = (annotation as? FirAnnotationCall)?.containingDeclarationSymbol ?: continue
         when (phase) {
             FirResolvePhase.TYPES -> resolveAnnotationsWithClassIds(containerSymbol)
             FirResolvePhase.ANNOTATION_ARGUMENTS -> annotations.resolveAnnotationsWithArguments(containerSymbol)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.after.txt
index 0e82bd320c6..b619d714010 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.after.txt
@@ -1,14 +1,14 @@
 @R|Anno|(position = <strcat>(String(bound ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(super type ), R|<local>/localProp|))  A<@R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
@@ -20,15 +20,15 @@
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  A<@R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.before.txt
index 0e82bd320c6..b619d714010 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClass.before.txt
@@ -1,14 +1,14 @@
 @R|Anno|(position = <strcat>(String(bound ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(super type ), R|<local>/localProp|))  A<@R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
@@ -20,15 +20,15 @@
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  A<@R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.after.txt
index b0f6d50dbf3..5cbd2dcbd50 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.after.txt
@@ -1,14 +1,14 @@
 @R|Anno|(position = <strcat>(String(bound ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(super type ), R|<local>/localProp|))  A<@R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
@@ -20,15 +20,15 @@
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  A<@R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
@@ -104,3 +104,4 @@ FILE: [ResolvedTo(IMPORTS)] classAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.before.txt
index b0f6d50dbf3..5cbd2dcbd50 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/classAnnotationsInLocalClassScript.before.txt
@@ -1,14 +1,14 @@
 @R|Anno|(position = <strcat>(String(bound ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), R|<local>/localProp|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(super type ), R|<local>/localProp|))  A<@R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), R|<local>/localProp|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), R|<local>/localProp|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.OriginalClass
@@ -20,15 +20,15 @@
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirRegularClassSymbol <local>/OriginalClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  A<@R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol <local>/OriginalClass.InnerClass]
 
 @R|Anno|(position = <strcat>(String(nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested super type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Int>
   context -> FirConstructorSymbol <local>/OriginalClass.InnerClass.InnerClass
@@ -104,3 +104,4 @@ FILE: [ResolvedTo(IMPORTS)] classAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt
index 3a7ce3664b9..ccde2fbd8ff 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt
index ffdc56b3601..1acec4f3bcf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.before.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt
index bfc9a38297c..b93c1a272b3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt
index 1646f8ab7f8..43b0ce079c4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.before.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.after.txt
index d5a94d31565..3c054a6d99f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.after.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt
index d5a94d31565..3c054a6d99f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.after.txt
index 1d7998eaa25..a37640a5dd0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.after.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt
index 1d7998eaa25..a37640a5dd0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.after.txt
index 728a1363c99..9bfc056149d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.after.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt
index 728a1363c99..9bfc056149d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.after.txt
index 4258a5f2614..4017e70ee65 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.after.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt
index 4258a5f2614..4017e70ee65 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt
@@ -1,6 +1,6 @@
 @R|util/Anno|(position = <strcat>(String(super type call ), R|util/prop|))  util/AbstractClass<@R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>>
   context -> FirConstructorSymbol util/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol util/MyClass]
 
 @R|util/Anno|(position = <strcat>(String(nested super type ref ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(nested nested super type ref ), R|util/prop|))  kotlin/Int>
   context -> FirConstructorSymbol util/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.after.txt
index 88330c934b7..29c5a40a11f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.after.txt
@@ -1,28 +1,28 @@
-@R|second/Anno|(constant#)  second/Base
+@R|second/Anno|(int = R|second/constant|)  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.int] int: Int): R|second/Anno| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.int] int: R|kotlin/Int|): R|second/Anno| {
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val int: Int = R|<local>/int|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+        public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val int: R|kotlin/Int| = R|<local>/int|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
     public? final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
     }
     public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK }
-    public? final? const [ResolvedTo(RAW_FIR)] val constant: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#)  second/Base| {
+    public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
+    public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|)  second/Base| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
             LAZY_super<<implicit>>
         }
 
-        private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(constant#)  second/Base| = LAZY_EXPRESSION
+        private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(int = R|second/constant|)  second/Base| = LAZY_EXPRESSION
 
         @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.Anno.string] string: String): R|second/MyClass.Anno| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.before.txt
index 88330c934b7..3b1099005ce 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(constant#)  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.after.txt
index 6dc7ec9d69c..0fa89f8a502 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.after.txt
@@ -1,19 +1,19 @@
-@R|second/Anno|(constant#)  second/Base
+@R|second/Anno|(int = R|second/constant|)  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegateFieldWithAnnotationClashScript.kts>
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)] <script-delegateFieldWithAnnotationClashScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.int] int: Int): R|second/Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.int] int: R|kotlin/Int|): R|second/Anno| {
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val int: Int = R|<local>/int|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val int: R|kotlin/Int| = R|<local>/int|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
         }
 
@@ -22,15 +22,15 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts
 
         public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK }
 
-        public? final? const [ResolvedTo(RAW_FIR)] val constant: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
-        public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#)  second/Base| {
+        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|)  second/Base| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
                 LAZY_super<<implicit>>
             }
 
-            private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(constant#)  second/Base| = LAZY_EXPRESSION
+            private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(int = R|second/constant|)  second/Base| = LAZY_EXPRESSION
 
             @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.Anno.string] string: String): R|second/MyClass.Anno| {
@@ -43,3 +43,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.before.txt
index 6dc7ec9d69c..fb6a5402655 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(constant#)  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -43,3 +43,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt
index 19021a77bd2..5bc9595b34d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), R|/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), R|/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt
index dc64a757e3f..62b8f64d6ad 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt
index 801ea3d1834..42dd8a988e4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), R|/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), R|/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
@@ -81,3 +81,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitTypeScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.before.txt
index 2f1f720f5dd..5ddb78cba22 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
@@ -79,3 +79,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitTypeScript.kts
             @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(STATUS)] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|(<strcat>(String(receiver type ), prop#))  kotlin/collections/Collection<@R|Anno|(<strcat>(String(nested receiver type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested receiver type ), prop#))  kotlin/String>>|.explicitType([ResolvedTo(STATUS)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>|): R|@R|Anno|(<strcat>(String(explicitType return type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(explicitType nested return type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(explicitType nested nested return type ), prop#))  kotlin/Int>>| { LAZY_BLOCK }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.after.txt
index e4805041ccd..508c2c22333 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.before.txt
index 180748b5736..07cd53c75b4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailable.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.after.txt
index e0f381d8f85..ce500e17e79 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
@@ -88,3 +88,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitTypeUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.before.txt
index e1f22adde42..f47bd837c26 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeUnavailableScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.explicitType
@@ -86,3 +86,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitTypeUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.after.txt
index 87d59aa9165..da8d9a9a27c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), R|/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), R|/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.before.txt
index fe0f197158b..6597465830b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitType.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.after.txt
index 1decff3397f..925790b0185 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), R|/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), R|/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), R|/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
@@ -85,3 +85,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
         public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun explicitType(): R|@R|Anno|(position = <strcat>(String(explicitType return type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(explicitType nested return type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(explicitType nested nested return type ), R|/prop|))  kotlin/Int>>| {
             ^explicitType IntegerLiteral(1)
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.before.txt
index bfeaa46704f..8312f17e5e0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
@@ -85,3 +85,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
         public final [ResolvedTo(CONTRACTS)] fun explicitType(): R|@R|Anno|(<strcat>(String(explicitType return type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(explicitType nested return type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(explicitType nested nested return type ), prop#))  kotlin/Int>>| {
             ^explicitType IntegerLiteral(1)
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.after.txt
index ccd65086009..e08ada2cee9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.before.txt
index 812794220b2..a87579277ef 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailable.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.after.txt
index 72ce5711da0..f560f11b17e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
@@ -92,3 +92,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.before.txt
index c3771520ff5..098ff233542 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithImplicitTypeUnavailableScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /Derived.implicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.implicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.implicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /Derived.implicitType
@@ -92,3 +92,4 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.after.txt
index 9515ca73748..889d538932e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.before.txt
index 7f565fcd62d..ff46f624117 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.after.txt
index 79cd10c9437..8bb65e88130 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.after.txt
@@ -1,31 +1,31 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+        public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
     public? final? [ResolvedTo(SUPER_TYPES)] interface Base : R|kotlin/Any| {
         public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
-    public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+    public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| {
             LAZY_super<<implicit>>
         }
 
-        private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| = LAZY_EXPRESSION
+        private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| = LAZY_EXPRESSION
 
         public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base = R|<local>/prop|
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) second.Base
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.before.txt
index 79cd10c9437..a1ccb22c90a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.after.txt
index 1cc3acab2bb..43f24c08cd9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.after.txt
@@ -1,19 +1,19 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-delegatedFieldNestedNameClashAndAnnotationsScript.kts>
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)] <script-delegatedFieldNestedNameClashAndAnnotationsScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
         }
 
@@ -22,18 +22,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt
 
         }
 
-        public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public? final? [ResolvedTo(TYPES)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| {
                 LAZY_super<<implicit>>
             }
 
-            private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| = LAZY_EXPRESSION
+            private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| = LAZY_EXPRESSION
 
             public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base = R|<local>/prop|
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] get(): @Anno[Unresolved](LAZY_EXPRESSION) second.Base
@@ -55,3 +55,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.before.txt
index 1cc3acab2bb..895c9287166 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -55,3 +55,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.after.txt
index 4d2a2beef46..8e793c0e9cd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.before.txt
index 50e1be3cfd1..576e29dccdb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(3).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(4).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.after.txt
index 2962ec77a6b..f5cf1504155 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
@@ -63,3 +63,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.before.txt
index 1814019eee2..5395bde8bbc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(3).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(4).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
@@ -63,3 +63,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.after.txt
index f37c6490f45..20b2e36dcb2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
@@ -69,3 +69,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.before.txt
index 66b447c0d5b..ee863f34355 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  kotlin/Int>>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  kotlin/Int>
   context -> FirFieldSymbol second/MyClass.$$delegate_0
@@ -69,3 +69,4 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.after.txt
index 61296fd901b..1e85f4f2206 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.after.txt
@@ -1,6 +1,6 @@
 @R|one/Anno|(position = <strcat>(String(super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested nested super type ref ), R|one/prop|))  kotlin/Int>>
   context -> FirFieldSymbol one/Usage.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol one/Usage]
 
 @R|one/Anno|(position = <strcat>(String(nested super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested nested super type ref ), R|one/prop|))  kotlin/Int>
   context -> FirFieldSymbol one/Usage.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.before.txt
index 30eebc03adb..b0445c4c5cd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.before.txt
@@ -1,6 +1,6 @@
 @R|one/Anno|(<strcat>(String(super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested nested super type ref ), prop#))  kotlin/Int>>
   context -> FirFieldSymbol one/Usage.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol one/Usage]
 
 @R|one/Anno|(<strcat>(String(nested super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested nested super type ref ), prop#))  kotlin/Int>
   context -> FirFieldSymbol one/Usage.$$delegate_0
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.after.txt
index 24253e6f934..fe9d61a3da7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.after.txt
@@ -1,6 +1,6 @@
 @R|one/Anno|(position = <strcat>(String(super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested nested super type ref ), R|one/prop|))  kotlin/Int>>
   context -> FirFieldSymbol one/Usage.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol one/Usage]
 
 @R|one/Anno|(position = <strcat>(String(nested super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested nested super type ref ), R|one/prop|))  kotlin/Int>
   context -> FirFieldSymbol one/Usage.$$delegate_0
@@ -36,3 +36,4 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts
             private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|one/Anno|(position = <strcat>(String(super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested super type ref ), R|one/prop|))  kotlin/collections/List<@R|one/Anno|(position = <strcat>(String(nested nested super type ref ), R|one/prop|))  kotlin/Int>>| = LAZY_EXPRESSION
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.before.txt
index dd597512450..3bd3f5a0d34 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.before.txt
@@ -1,6 +1,6 @@
 @R|one/Anno|(<strcat>(String(super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested nested super type ref ), prop#))  kotlin/Int>>
   context -> FirFieldSymbol one/Usage.$$delegate_0
-  anchor -> []
+  anchor -> [FirRegularClassSymbol one/Usage]
 
 @R|one/Anno|(<strcat>(String(nested super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested nested super type ref ), prop#))  kotlin/Int>
   context -> FirFieldSymbol one/Usage.$$delegate_0
@@ -36,3 +36,4 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts
             private final [ResolvedTo(TYPES)] field $$delegate_0: R|@R|one/Anno|(<strcat>(String(super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested super type ref ), prop#))  kotlin/collections/List<@R|one/Anno|(<strcat>(String(nested nested super type ref ), prop#))  kotlin/Int>>| = LAZY_EXPRESSION
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.after.txt
index efc15b5798d..f026d91234d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.after.txt
@@ -1,194 +1,194 @@
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] scriptStatementLevel.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -213,17 +213,17 @@ FILE: [ResolvedTo(IMPORTS)] scriptStatementLevel.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component1(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component2(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component2(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = this@R|util/Pair|.R|util/Pair.a|, [ResolvedTo(ANNOTATION_ARGUMENTS)] b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = this@R|util/Pair|.R|util/Pair.b|): R|util/Pair|
+            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = this@R|util/Pair|.R|util/Pair.a|, [ResolvedTo(STATUS)] b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = this@R|util/Pair|.R|util/Pair.b|): R|util/Pair|
 
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.before.txt
index c033d577821..667e28f5ad6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevel.before.txt
@@ -1,194 +1,194 @@
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirPropertySymbol util/Pair.a]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirPropertySymbol util/Pair.b]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol util/Pair.b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirNamedFunctionSymbol util/Pair.component1
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/Pair.component2
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/a from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/b from FirNamedFunctionSymbol util/Pair.copy
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] scriptStatementLevel.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.after.txt
index 1ce07dfc284..3b4b3f02599 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.after.txt
@@ -1,50 +1,50 @@
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] scriptStatementLevelAsLastStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -69,15 +69,15 @@ FILE: [ResolvedTo(IMPORTS)] scriptStatementLevelAsLastStatement.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component1(): R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component2(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component2(): R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
             public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] a: R|@R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = this@R|util/Pair|.R|util/Pair.a|, [ResolvedTo(STATUS)] b: R|@R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = this@R|util/Pair|.R|util/Pair.b|): R|util/Pair|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.before.txt
index 8552ca70b25..3f16cd4a61b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/destructuringDeclaration/scriptStatementLevelAsLastStatement.before.txt
@@ -1,50 +1,50 @@
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/c
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(str = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/d
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] scriptStatementLevelAsLastStatement.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.after.txt
index 1bf20f955f2..6200757523e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.after.txt
@@ -1,33 +1,34 @@
-@R|lowlevel/Anno|(<strcat>(String(return ), prop#))  ERROR CLASS: Symbol not found for Type3
+@R|lowlevel/Anno|(position = <strcat>(String(return ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
+@R|lowlevel/Anno|(position = <strcat>(String(receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
+@R|lowlevel/Anno|(position = <strcat>(String(param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
+@R|lowlevel/Anno|(position = <strcat>(String(nested param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  ERROR CLASS: Symbol not found for ASF
+@R|lowlevel/Anno|(position = <strcat>(String(bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] errorType.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=lowlevel/Anno.position] position: String): R|lowlevel/Anno| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=lowlevel/Anno.position] position: R|kotlin/String|): R|lowlevel/Anno| {
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|<local>/position|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
+        public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|<local>/position|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
 
     }
-    public? final? const [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] F : @R|lowlevel/Anno|[Unresolved](<strcat>(String(bound ), prop#)) <ERROR TYPE REF: Symbol not found for ASF>> @R|lowlevel/Anno|[Unresolved](<strcat>(String(receiver ), prop#)) <ERROR TYPE REF: Symbol not found for Abc>.function([ResolvedTo(TYPES)] param: @R|lowlevel/Anno|[Unresolved](<strcat>(String(param ), prop#)) <ERROR TYPE REF: Symbol not found for Type1>): @R|lowlevel/Anno|[Unresolved](<strcat>(String(return ), prop#)) <ERROR TYPE REF: Symbol not found for Type3> { LAZY_BLOCK }
+    public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String|
+    public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] F : @R|lowlevel/Anno|[Types](position = <strcat>(String(bound ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for ASF>> @R|lowlevel/Anno|[Types](position = <strcat>(String(receiver ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Abc>.function([ResolvedTo(ANNOTATION_ARGUMENTS)] param: @R|lowlevel/Anno|[Types](position = <strcat>(String(param ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Type1>): @R|lowlevel/Anno|[Types](position = <strcat>(String(return ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Type3> {
+    }
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.before.txt
index 1bf20f955f2..a6895ffc34f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorType.before.txt
@@ -1,22 +1,22 @@
 @R|lowlevel/Anno|(<strcat>(String(return ), prop#))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] errorType.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.after.txt
index 2c737fa697c..19cd60ac155 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.after.txt
@@ -1,39 +1,41 @@
-@R|lowlevel/Anno|(<strcat>(String(return ), prop#))  ERROR CLASS: Symbol not found for Type3
+@R|lowlevel/Anno|(position = <strcat>(String(return ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
+@R|lowlevel/Anno|(position = <strcat>(String(receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
+@R|lowlevel/Anno|(position = <strcat>(String(param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
+@R|lowlevel/Anno|(position = <strcat>(String(nested param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
-@R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  ERROR CLASS: Symbol not found for ASF
+@R|lowlevel/Anno|(position = <strcat>(String(bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] errorTypeScript.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-errorTypeScript.kts>
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)] <script-errorTypeScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=lowlevel/Anno.position] position: String): R|lowlevel/Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=lowlevel/Anno.position] position: R|kotlin/String|): R|lowlevel/Anno| {
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|<local>/position|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|<local>/position|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String|
 
         }
 
-        public? final? const [ResolvedTo(RAW_FIR)] val prop: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String|
+
+        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] F : @R|lowlevel/Anno|[Types](position = <strcat>(String(bound ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for ASF>> @R|lowlevel/Anno|[Types](position = <strcat>(String(receiver ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Abc>.function([ResolvedTo(ANNOTATION_ARGUMENTS)] param: @R|lowlevel/Anno|[Types](position = <strcat>(String(param ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Type1>): @R|lowlevel/Anno|[Types](position = <strcat>(String(return ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Type3> {
+        }
 
-        public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] F : @R|lowlevel/Anno|[Unresolved](<strcat>(String(bound ), prop#)) <ERROR TYPE REF: Symbol not found for ASF>> @R|lowlevel/Anno|[Unresolved](<strcat>(String(receiver ), prop#)) <ERROR TYPE REF: Symbol not found for Abc>.function([ResolvedTo(TYPES)] param: @R|lowlevel/Anno|[Unresolved](<strcat>(String(param ), prop#)) <ERROR TYPE REF: Symbol not found for Type1>): @R|lowlevel/Anno|[Unresolved](<strcat>(String(return ), prop#)) <ERROR TYPE REF: Symbol not found for Type3> { LAZY_BLOCK }
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.before.txt
index 2c737fa697c..d2313747745 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/errorTypeScript.before.txt
@@ -1,22 +1,22 @@
 @R|lowlevel/Anno|(<strcat>(String(return ), prop#))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] errorTypeScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -37,3 +37,4 @@ FILE: [ResolvedTo(IMPORTS)] errorTypeScript.kts
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
         public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] F : @R|lowlevel/Anno|[Unresolved](<strcat>(String(bound ), prop#)) <ERROR TYPE REF: Symbol not found for ASF>> @R|lowlevel/Anno|[Unresolved](<strcat>(String(receiver ), prop#)) <ERROR TYPE REF: Symbol not found for Abc>.function([ResolvedTo(TYPES)] param: @R|lowlevel/Anno|[Unresolved](<strcat>(String(param ), prop#)) <ERROR TYPE REF: Symbol not found for Type1>): @R|lowlevel/Anno|[Unresolved](<strcat>(String(return ), prop#)) <ERROR TYPE REF: Symbol not found for Type3> { LAZY_BLOCK }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.after.txt
index 7090320626c..89430242148 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.after.txt
@@ -4,7 +4,7 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(receiver ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc>
   context -> FirNamedFunctionSymbol lowlevel/function
@@ -12,15 +12,15 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
@@ -28,7 +28,7 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnType.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.before.txt
index 4bf3f0f4274..ef41fec43ac 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnType.before.txt
@@ -4,7 +4,7 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested return ), prop#))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested receiver ), prop#))  ERROR CLASS: Symbol not found for Abc>
   context -> FirNamedFunctionSymbol lowlevel/function
@@ -12,15 +12,15 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound ), prop#))  ERROR CLASS: Symbol not found for ASF>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
@@ -28,7 +28,7 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested bound ), prop#))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnType.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.after.txt
index 35a71f045b3..9215b37d1ac 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.after.txt
@@ -4,7 +4,7 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(receiver ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc>
   context -> FirNamedFunctionSymbol lowlevel/function
@@ -12,15 +12,15 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested param ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
@@ -28,7 +28,7 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnTypeScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -50,3 +50,4 @@ FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnTypeScript.kts
 
         public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] F : R|@R|lowlevel/Anno|(position = <strcat>(String(bound ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for ASF>|> R|@R|lowlevel/Anno|(position = <strcat>(String(receiver ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Abc>|.function([ResolvedTo(ANNOTATION_ARGUMENTS)] param: @R|lowlevel/Anno|[Types](position = <strcat>(String(param ), R|lowlevel/prop|)) <ERROR TYPE REF: Symbol not found for Type1>): R|@R|lowlevel/Anno|(position = <strcat>(String(return ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return ), R|lowlevel/prop|))  ERROR CLASS: Symbol not found for Type3>| {
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.before.txt
index 6fac16d9db3..62436382c69 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/errorType/nestedErrorReturnTypeScript.before.txt
@@ -4,7 +4,7 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested return ), prop#))  ERROR CLASS: Symbol not found for Type3
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested receiver ), prop#))  ERROR CLASS: Symbol not found for Abc>
   context -> FirNamedFunctionSymbol lowlevel/function
@@ -12,15 +12,15 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested receiver ), prop#))  ERROR CLASS: Symbol not found for Abc
   context -> FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(param ), prop#))  ERROR CLASS: Symbol not found for Type1
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested param ), prop#))  ERROR CLASS: Symbol not found for Type2
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound ), prop#))  ERROR CLASS: Symbol not found for ASF>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
@@ -28,7 +28,7 @@
 
 @R|lowlevel/Anno|(<strcat>(String(nested bound ), prop#))  ERROR CLASS: Symbol not found for ASF
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol lowlevel/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnTypeScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -49,3 +49,4 @@ FILE: [ResolvedTo(IMPORTS)] nestedErrorReturnTypeScript.kts
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
         public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] F : R|@R|lowlevel/Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound ), prop#))  ERROR CLASS: Symbol not found for ASF>|> R|@R|lowlevel/Anno|(<strcat>(String(receiver ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested receiver ), prop#))  ERROR CLASS: Symbol not found for Abc>|.function([ResolvedTo(TYPES)] param: @R|lowlevel/Anno|[Unresolved](<strcat>(String(param ), prop#)) <ERROR TYPE REF: Symbol not found for Type1>): R|@R|lowlevel/Anno|(<strcat>(String(return ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested return ), prop#))  ERROR CLASS: Symbol not found for Type3>| { LAZY_BLOCK }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt
index b771c3b0640..3fc791827c1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.after.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirNamedFunctionSymbol one/two/MyDataClass.component1]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -33,8 +33,8 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
         public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
             public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
@@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt
 
         }
 
-        public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+        public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
         public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt
index 4936e35eeb6..6f2a54e4912 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotations.before.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirNamedFunctionSymbol one/two/MyDataClass.component1]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt
index 53a574bd40a..a2366c49c2c 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.after.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirNamedFunctionSymbol one/two/MyDataClass.component1]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -40,8 +40,8 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
             public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
                 public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
@@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts
 
             }
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+            public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
             public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt
index f7fba1d0e8b..ad8679e4b2e 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/component1TypeCollisionAndAnnotationsScript.before.txt
@@ -1,14 +1,14 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirNamedFunctionSymbol one/two/MyDataClass.component1]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirNamedFunctionSymbol one/two/MyDataClass.component1
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionAndAnnotationsScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt
index 7559e6cb762..61e7505c424 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.after.txt
@@ -1,26 +1,26 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -45,11 +45,11 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
         public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass<B>| {
@@ -72,6 +72,6 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt
 
         public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass|
+        public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass|
 
     }
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt
index 462c7148624..447d9cc9b49 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotations.before.txt
@@ -1,26 +1,26 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(3).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(4).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt
index c3d211d7a0b..d1b2e3380d6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.after.txt
@@ -1,26 +1,26 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -52,11 +52,11 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop1|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component2, IsFromPrimaryConstructor=true] val prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop2|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
             public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass<B>| {
@@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts
 
             public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass|
+            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] prop1: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop1|, [ResolvedTo(STATUS)] prop2: R|@R|one/two/Anno|(i = Int(3).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(4).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(5).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop2|): R|one/two/MyDataClass|
 
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt
index 31cafb46b62..92678fd14a1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/copyTypeCollisionAndAnnotationsScript.before.txt
@@ -1,26 +1,26 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop1 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop1 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(3).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(4).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(4).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(5).plus#(constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop2 from FirNamedFunctionSymbol one/two/MyDataClass.copy
-  anchor -> [FirValueParameterSymbol <local>/prop2 from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionAndAnnotationsScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.after.txt
index 98ac456587c..ad34b2a12e6 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsAsConstructor.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.before.txt
index 81d49ad665d..3b30477761f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructor.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(inner#))  second/Base
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsAsConstructor.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.after.txt
index b8df353eeb4..982023e0b4d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.before.txt
index e7b9d74efa9..673e7aad6f9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(inner#))  second/Base
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsAsConstructorScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.after.txt
index 5ab68d4b209..257342e7314 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.after.txt
@@ -1,14 +1,14 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.before.txt
index 856f18572e3..0d866019298 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.before.txt
@@ -1,14 +1,14 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructor.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.after.txt
index 2e350199621..fbd45253f39 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.after.txt
@@ -1,14 +1,14 @@
 @R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.before.txt
index cc7470b0b61..1fea75a8f07 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.before.txt
@@ -1,14 +1,14 @@
 @R|second/Anno|(IntegerLiteral(0).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(inner#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(inner#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol second/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol second/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsAsConstructorScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.after.txt
index c55b920ee05..f46947d727b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.after.txt
@@ -24,15 +24,15 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(parameter type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol lowlevel/function
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.before.txt
index 19cc027520b..9c4098e7c53 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitType.before.txt
@@ -24,15 +24,15 @@
 
 @R|lowlevel/Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/Collection<@R|lowlevel/Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound type ), prop#))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol lowlevel/function
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.after.txt
index 3bfc53e4a90..9b8f60161b8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|lowlevel/Anno|(position = <strcat>(String(parameter type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol lowlevel/function
@@ -74,3 +74,4 @@ FILE: [ResolvedTo(IMPORTS)] explicitTypeScript.kts
         @R|lowlevel/Anno|[Types](position = <strcat>(String(function ), R|lowlevel/prop|)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <@R|lowlevel/Anno|[Types](position = <strcat>(String(type parameter ), R|lowlevel/prop|)) [ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|@R|lowlevel/Anno|(position = <strcat>(String(bound type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String>|, R|@R|lowlevel/Anno|(position = <strcat>(String(constraint type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested constraint type ), R|lowlevel/prop|))  kotlin/Int>|> @RECEIVER:R|lowlevel/Anno|[Types](position = <strcat>(String(receiver ), R|lowlevel/prop|)) R|@R|lowlevel/Anno|(position = <strcat>(String(receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int>>|.function([ResolvedTo(ANNOTATION_ARGUMENTS)] @R|lowlevel/Anno|[Types](position = <strcat>(String(parameter ), R|lowlevel/prop|)) param: R|@R|lowlevel/Anno|(position = <strcat>(String(parameter type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>>| = IntegerLiteral(1)): R|@R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>| {
             ^function IntegerLiteral(1)
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.before.txt
index 8e9782736f9..a2f6bc1a8fe 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/explicitTypeScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|lowlevel/Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/Collection<@R|lowlevel/Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol lowlevel/function]
+  anchor -> [FirNamedFunctionSymbol lowlevel/function]
 
 @R|lowlevel/Anno|(<strcat>(String(bound type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound type ), prop#))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol lowlevel/function
@@ -72,3 +72,4 @@ FILE: [ResolvedTo(IMPORTS)] explicitTypeScript.kts
         }
 
         @R|lowlevel/Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun <@R|lowlevel/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(TYPES)] T : R|@R|lowlevel/Anno|(<strcat>(String(bound type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested bound type ), prop#))  kotlin/String>|, R|@R|lowlevel/Anno|(<strcat>(String(constraint type ), prop#))  kotlin/collections/Collection<@R|lowlevel/Anno|(<strcat>(String(nested constraint type ), prop#))  kotlin/Int>|> @RECEIVER:R|lowlevel/Anno|[Types](LAZY_EXPRESSION) R|@R|lowlevel/Anno|(<strcat>(String(receiver type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested receiver type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested receiver type ), prop#))  kotlin/Int>>|.function([ResolvedTo(TYPES)] @R|lowlevel/Anno|[Types](LAZY_EXPRESSION) param: R|@R|lowlevel/Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/Collection<@R|lowlevel/Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>| = LAZY_EXPRESSION): R|@R|lowlevel/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|lowlevel/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>| { LAZY_BLOCK }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt
index ba2d6678fd8..53be5a72a96 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.after.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirNamedFunctionSymbol properties/MyClass.component1]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -27,10 +27,10 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
 
-        public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+        public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
 
         public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt
index e649d1123c9..2021b1a04a7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentN.before.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirNamedFunctionSymbol properties/MyClass.component1]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedComponentN.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt
index 84348e52a56..55e8fb5fa06 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.after.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirNamedFunctionSymbol properties/MyClass.component1]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -33,10 +33,10 @@ FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+            public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
 
             public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property|): R|properties/MyClass|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt
index 7f3636b18dd..b81c79b8a7a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedComponentNScript.before.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirNamedFunctionSymbol properties/MyClass.component1]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirNamedFunctionSymbol properties/MyClass.component1
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedComponentNScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt
index e393676f26d..fb7820a115a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.after.txt
@@ -1,26 +1,26 @@
 @R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -39,16 +39,16 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property1|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property1|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = R|<local>/property2|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = R|<local>/property2|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
 
         public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
 
         public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass|
+        public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(STATUS)] property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass|
 
     }
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt
index b363e39bcd7..c1acb08ee76 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopy.before.txt
@@ -1,26 +1,26 @@
 @R|properties/Anno|(<strcat>(String(parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedCopy.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt
index cd97166dee7..562c6327149 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.after.txt
@@ -1,26 +1,26 @@
 @R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -45,17 +45,17 @@ FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property1|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component1, IsFromPrimaryConstructor=true] val property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property1|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = R|<local>/property2|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=properties/MyClass.component2, IsFromPrimaryConstructor=true] val property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = R|<local>/property2|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
 
             public final operator [ResolvedTo(STATUS)] fun component1(): R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>|
 
             public final operator [ResolvedTo(STATUS)] fun component2(): R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun copy([ResolvedTo(ANNOTATION_ARGUMENTS)] property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(ANNOTATION_ARGUMENTS)] property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass|
+            public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] property1: R|@R|properties/Anno|(position = <strcat>(String(parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter1 type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter1 type: ), R|properties/constant|))  kotlin/Int>>| = this@R|properties/MyClass|.R|properties/MyClass.property1|, [ResolvedTo(STATUS)] property2: R|@R|properties/Anno|(position = <strcat>(String(parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested parameter2 type: ), R|properties/constant|))  kotlin/collections/Collection<@R|properties/Anno|(position = <strcat>(String(nested nested parameter2 type: ), R|properties/constant|))  kotlin/String>>| = this@R|properties/MyClass|.R|properties/MyClass.property2|): R|properties/MyClass|
 
         }
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt
index 386217c36da..cc5ca7f3876 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/generatedCopyScript.before.txt
@@ -1,26 +1,26 @@
 @R|properties/Anno|(<strcat>(String(parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter1 type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter1 type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property1 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property1 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter2 type: ), constant#))  kotlin/collections/Collection<@R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter2 type: ), constant#))  kotlin/String
   context -> FirValueParameterSymbol <local>/property2 from FirNamedFunctionSymbol properties/MyClass.copy
-  anchor -> [FirValueParameterSymbol <local>/property2 from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedCopyScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.after.txt
index 62dd562fe2d..d5276b3c230 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.after.txt
@@ -1,54 +1,54 @@
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(parameter type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(constraint type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested constraint type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested constraint type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 FILE: [ResolvedTo(IMPORTS)] localFunction.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.before.txt
index 62dd562fe2d..d5276b3c230 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunction.before.txt
@@ -1,54 +1,54 @@
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested receiver type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested receiver type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(parameter type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested parameter type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested parameter type ), R|lowlevel/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(bound type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested bound type ), R|lowlevel/prop|))  kotlin/String
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(constraint type ), R|lowlevel/prop|))  kotlin/collections/Collection<@R|lowlevel/Anno|(position = <strcat>(String(nested constraint type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested constraint type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirTypeParameterSymbol T from FirNamedFunctionSymbol <local>/function
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 FILE: [ResolvedTo(IMPORTS)] localFunction.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.after.txt
index 1dd5f70bce3..b47e9ee78ca 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.after.txt
@@ -1,26 +1,26 @@
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 FILE: [ResolvedTo(IMPORTS)] localFunctionImplicitType.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.before.txt
index 1dd5f70bce3..b47e9ee78ca 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localFunctionImplicitType.before.txt
@@ -1,26 +1,26 @@
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/explicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>>
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested return type ), R|lowlevel/prop|))  kotlin/collections/List<@R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int>
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 @R|lowlevel/Anno|(position = <strcat>(String(nested nested return type ), R|lowlevel/prop|))  kotlin/Int
   context -> FirNamedFunctionSymbol <local>/implicitType
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol lowlevel/func]
 
 FILE: [ResolvedTo(IMPORTS)] localFunctionImplicitType.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.after.txt
index e0f5685f90d..4c533356df3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.after.txt
@@ -93,3 +93,4 @@ FILE: [ResolvedTo(IMPORTS)] localImplicitTypeUnavailableScript.kts
 
             [ResolvedTo(BODY_RESOLVE)] lval a: R|@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?| = R|<local>/A.A|().R|<local>/bar|()
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.before.txt
index e0f5685f90d..4c533356df3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/localImplicitTypeUnavailableScript.before.txt
@@ -93,3 +93,4 @@ FILE: [ResolvedTo(IMPORTS)] localImplicitTypeUnavailableScript.kts
 
             [ResolvedTo(BODY_RESOLVE)] lval a: R|@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?| = R|<local>/A.A|().R|<local>/bar|()
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.after.txt
index f8e8714a415..87d039c3fe7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.after.txt
@@ -1,38 +1,38 @@
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  util/Pair
   context -> FirPropertySymbol <local>/<iterator>
@@ -44,87 +44,87 @@
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] multiDeclaration.kt
     public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -143,15 +143,15 @@ FILE: [ResolvedTo(IMPORTS)] multiDeclaration.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+        public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+        public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
-        public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+        public final operator [ResolvedTo(CONTRACTS)] fun component1(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-        public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component2(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+        public final operator [ResolvedTo(CONTRACTS)] fun component2(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
         public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = this@R|util/Pair|.R|util/Pair.a|, [ResolvedTo(STATUS)] b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = this@R|util/Pair|.R|util/Pair.b|): R|util/Pair|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.before.txt
index 80bbf3d2c7e..e724314bc22 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclaration.before.txt
@@ -1,38 +1,38 @@
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  util/Pair
   context -> FirPropertySymbol <local>/<iterator>
@@ -44,87 +44,87 @@
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] multiDeclaration.kt
     public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.after.txt
index c093c431ca9..c7fe951a5f2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.after.txt
@@ -1,38 +1,38 @@
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  util/Pair
   context -> FirPropertySymbol <local>/<iterator>
@@ -44,87 +44,87 @@
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] multiDeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -149,15 +149,15 @@ FILE: [ResolvedTo(IMPORTS)] multiDeclarationScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component1, IsFromPrimaryConstructor=true] val a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = R|<local>/a|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final [ResolvedTo(CONTRACTS)] [ComponentFunctionSymbolKey=util/Pair.component2, IsFromPrimaryConstructor=true] val b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = R|<local>/b|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Pair] get(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component1(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component1(): R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?|
 
-            public final operator [ResolvedTo(ANNOTATION_ARGUMENTS)] fun component2(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
+            public final operator [ResolvedTo(CONTRACTS)] fun component2(): R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?|
 
             public final [ResolvedTo(STATUS)] fun copy([ResolvedTo(STATUS)] a: R|@R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?| = this@R|util/Pair|.R|util/Pair.a|, [ResolvedTo(STATUS)] b: R|@R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?| = this@R|util/Pair|.R|util/Pair.b|): R|util/Pair|
 
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.before.txt
index 5c8b98a7b4c..4f817fd3142 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/multiDeclarationScript.before.txt
@@ -1,38 +1,38 @@
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirNamedFunctionSymbol util/foo
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  util/Pair
   context -> FirPropertySymbol <local>/<iterator>
@@ -44,87 +44,87 @@
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/x
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/y
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>>?
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirNamedFunctionSymbol util/Pair.component1]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested type ), R|util/constant|))  kotlin/collections/Collection<@R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String>
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(a nested nested type ), R|util/constant|))  kotlin/String
   context -> FirPropertySymbol <local>/a
-  anchor -> [FirValueParameterSymbol <local>/a from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirPropertySymbol <local>/b
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b type ), R|util/constant|))  kotlin/Array<@R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>>?
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirNamedFunctionSymbol util/Pair.component2]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested type ), R|util/constant|))  kotlin/collections/List<@R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int>
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 @R|util/Anno|(position = <strcat>(String(b nested nested type ), R|util/constant|))  kotlin/Int
   context -> FirAnonymousFunctionSymbol special/anonymous
-  anchor -> [FirValueParameterSymbol <local>/b from FirConstructorSymbol util/Pair.Pair]
+  anchor -> [FirConstructorSymbol util/Pair.Pair]
 
 FILE: [ResolvedTo(IMPORTS)] multiDeclarationScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.after.txt
index e8e5307a4b0..96d1da3801a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.after.txt
@@ -80,3 +80,4 @@ FILE: [ResolvedTo(IMPORTS)] propagationBetweenLocalMemberFunctionsImplicitBodySc
             }
             )
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.before.txt
index e8e5307a4b0..96d1da3801a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsImplicitBodyScript.before.txt
@@ -80,3 +80,4 @@ FILE: [ResolvedTo(IMPORTS)] propagationBetweenLocalMemberFunctionsImplicitBodySc
             }
             )
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.after.txt
index f276646f01f..5a13b0024a5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.after.txt
@@ -73,3 +73,4 @@ FILE: [ResolvedTo(IMPORTS)] propagationBetweenLocalMemberFunctionsScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.before.txt
index f276646f01f..5a13b0024a5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/propagationBetweenLocalMemberFunctionsScript.before.txt
@@ -73,3 +73,4 @@ FILE: [ResolvedTo(IMPORTS)] propagationBetweenLocalMemberFunctionsScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.after.txt
index a6e6551520f..92d6ad871bc 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.after.txt
@@ -1,19 +1,19 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+        public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
     public? open [ResolvedTo(SUPER_TYPES)] class Base : R|kotlin/Any| {
@@ -22,13 +22,13 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
         }
 
     }
-    public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+    public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
+            LAZY_super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.before.txt
index a6e6551520f..1ce4f1cbd84 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotation.before.txt
@@ -1,10 +1,10 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotation.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.after.txt
index 38a4d4c007b..398eb054685 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.after.txt
@@ -1,19 +1,19 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstructor.kt
-    @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
             LAZY_super<R|kotlin/Any|>
         }
 
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+        public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
     }
     public? open [ResolvedTo(SUPER_TYPES)] class Base : R|kotlin/Any| {
@@ -22,13 +22,13 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
         }
 
     }
-    public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+    public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
     public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
         public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-    public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+    public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
         public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-            LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
+            LAZY_super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>
         }
 
         public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.before.txt
index 38a4d4c007b..875c09af5e5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructor.before.txt
@@ -1,10 +1,10 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstructor.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.after.txt
index b6b270eb43d..8ab51a1ec45 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.after.txt
@@ -1,23 +1,23 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstructorScript.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-superTypeCallNameClashWithAnnotationImplicitConstructorScript.kts>
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)] <script-superTypeCallNameClashWithAnnotationImplicitConstructorScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
         }
 
@@ -28,15 +28,15 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
 
         }
 
-        public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
+                LAZY_super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -60,3 +60,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.before.txt
index b6b270eb43d..fd6652cc87b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationImplicitConstructorScript.before.txt
@@ -1,10 +1,10 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstructorScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -60,3 +60,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationImplicitConstruc
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.after.txt
index 11ce7548b74..a9085e195d4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.after.txt
@@ -1,23 +1,23 @@
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
-@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
+@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
-    context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
-    SCRIPT: [ResolvedTo(RAW_FIR)] <script-superTypeCallNameClashWithAnnotationScript.kts>
+    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
+    SCRIPT: [ResolvedTo(TYPES)] <script-superTypeCallNameClashWithAnnotationScript.kts>
         [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
 
-        @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/Anno.i] i: Int): R|second/Anno| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/Anno.i] i: R|kotlin/Int|): R|second/Anno| {
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|<local>/i|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/Int|
 
         }
 
@@ -28,15 +28,15 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
 
         }
 
-        public? final? const [ResolvedTo(RAW_FIR)] val outer: <implicit> = LAZY_EXPRESSION
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
 
         public? final? const [ResolvedTo(RAW_FIR)] val inner: <implicit> = LAZY_EXPRESSION
             public? [ResolvedTo(RAW_FIR)] get(): <implicit>
 
-        public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base| {
+        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base| {
             public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| {
-                LAZY_super<R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base|>
+                LAZY_super<R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base|>
             }
 
             public? open [ResolvedTo(RAW_FIR)] class Base : R|kotlin/Any| {
@@ -60,3 +60,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.before.txt
index 11ce7548b74..a4262a18829 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNameClashWithAnnotationScript.before.txt
@@ -1,10 +1,10 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -60,3 +60,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.after.txt
index 5862e048eb7..f26dcd1b027 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.before.txt
index d55f17e2d16..267e96fcbf3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotation.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.after.txt
index 081bbb4a643..8bfc6cf5624 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.before.txt
index a973d070fad..df86313d5d5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructor.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.after.txt
index c84a5d0c02f..df98e7f26bf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -76,3 +76,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.before.txt
index 7098b3956d1..abd33d74e0a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationImplicitConstructorScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -76,3 +76,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationImplicitCo
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.after.txt
index 2ce91da0380..a79a688e2eb 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.after.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|))  second/Base<@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -76,3 +76,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.before.txt
index 363e1cfcaba..d7a55bc3bcf 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/superTypeCallNestedNameClashWithAnnotationScript.before.txt
@@ -1,6 +1,6 @@
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -12,7 +12,7 @@
 
 @R|second/Anno|(IntegerLiteral(1).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>>
   context -> FirConstructorSymbol second/MyClass.MyClass
-  anchor -> []
+  anchor -> [FirRegularClassSymbol second/MyClass]
 
 @R|second/Anno|(IntegerLiteral(2).plus#(outer#))  second/Base<@R|second/Anno|(IntegerLiteral(3).plus#(outer#))  kotlin/Int>
   context -> FirConstructorSymbol second/MyClass.MyClass
@@ -76,3 +76,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashWithAnnotationScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.after.txt
index 82ebe40a22b..3cd68aa1103 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|/OriginalInterface.Companion|.R|/OriginalInterface.Companion.prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /OriginalInterface.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.before.txt
index 954e4657491..c55791b7358 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotations.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(<strcat>(String(parameter type ), prop#))  kotlin/collections/ListIterator<@R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested parameter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(nested nested parameter type ), prop#))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol /OriginalInterface.explicitType]
+  anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType]
 
 @R|Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested bound ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(nested nested bound ), prop#))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol /OriginalInterface.explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.after.txt
index dfa7cec76ec..afcd1a2ee35 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol <local>/explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.before.txt
index dfa7cec76ec..afcd1a2ee35 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClass.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol <local>/explicitType
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.after.txt
index 8d7b85fc28b..c3fe7aa1cb5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.after.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol <local>/explicitType
@@ -77,3 +77,4 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.before.txt
index 8d7b85fc28b..c3fe7aa1cb5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/function/typeParameterAnnotationsInLocalClassScript.before.txt
@@ -24,15 +24,15 @@
 
 @R|Anno|(position = <strcat>(String(parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/ListIterator<@R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(nested nested parameter type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol <local>/explicitType]
+  anchor -> [FirNamedFunctionSymbol <local>/explicitType]
 
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(nested nested bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/String>>
   context -> FirTypeParameterSymbol F from FirNamedFunctionSymbol <local>/explicitType
@@ -77,3 +77,4 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.after.txt
index ba8bf591d62..9218c2f694f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.after.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.before.txt
index ef14788a9aa..825aee2632f 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameter.before.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.after.txt
index b7b98a176ce..1a15ca7ada0 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.after.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.before.txt
index 079f6098e25..e55473dddb3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/constructorParameterScript.before.txt
@@ -1,14 +1,14 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -38,3 +38,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts
                 @PROPERTY_SETTER:Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] set([ResolvedTo(RAW_FIR)] @SETTER_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) value: @R|properties/Anno|[Unresolved](<strcat>(String(parameter type: ), constant#)) List<R|@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>|>): R|kotlin/Unit|
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.after.txt
index 0eb180d7777..198ce0b8ebe 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.after.txt
@@ -28,7 +28,7 @@
 
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve]
+  anchor -> [FirPropertySymbol myPack/variableToResolve]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.before.txt
index df3b6229f2e..675fbc13e94 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitType.before.txt
@@ -28,7 +28,7 @@
 
 @R|myPack/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/Collection<@R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve]
+  anchor -> [FirPropertySymbol myPack/variableToResolve]
 
 @R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.after.txt
index 30cde5a5a9d..352533e3be8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.after.txt
@@ -28,7 +28,7 @@
 
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve]
+  anchor -> [FirPropertySymbol myPack/variableToResolve]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
@@ -83,3 +83,4 @@ FILE: [ResolvedTo(IMPORTS)] explicitTypeScript.kts
             @R|myPack/Anno|[Types](position = <strcat>(String(setter ), R|myPack/prop|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @R|myPack/Anno|[Types](position = <strcat>(String(setter parameter ), R|myPack/prop|)) value: R|@R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>|): R|kotlin/Unit| {
                 ^ Unit#
             }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.before.txt
index 0fadbdccdcb..461490c1409 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/explicitTypeScript.before.txt
@@ -28,7 +28,7 @@
 
 @R|myPack/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/Collection<@R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve]
+  anchor -> [FirPropertySymbol myPack/variableToResolve]
 
 @R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol myPack/variableToResolve
@@ -79,3 +79,4 @@ FILE: [ResolvedTo(IMPORTS)] explicitTypeScript.kts
         @R|myPack/Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] var <@R|myPack/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(TYPES)] T : R|@R|myPack/Anno|(<strcat>(String(bound ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested bound ), prop#))  kotlin/String>|> @RECEIVER:R|myPack/Anno|[Types](LAZY_EXPRESSION) R|@R|myPack/Anno|(<strcat>(String(receiver type ), prop#))  kotlin/collections/List<ERROR CLASS: Incomplete code>|.variableToResolve: R|@R|myPack/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/Collection<@R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>|
             @R|myPack/Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] get(): R|@R|myPack/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/Collection<@R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>| { LAZY_BLOCK }
             @R|myPack/Anno|[Types](LAZY_EXPRESSION) public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] @R|myPack/Anno|[Types](LAZY_EXPRESSION) value: R|@R|myPack/Anno|(<strcat>(String(return type ), prop#))  kotlin/collections/Collection<@R|myPack/Anno|(<strcat>(String(nested return type ), prop#))  kotlin/collections/List<@R|myPack/Anno|(<strcat>(String(nested nested return type ), prop#))  kotlin/Int>>|): R|kotlin/Unit| { LAZY_BLOCK }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.after.txt
index 62410b47300..ad05839bc01 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.after.txt
@@ -1,50 +1,50 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructor.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -63,9 +63,9 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructor.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @PROPERTY:R|properties/Anno|[Types](position = <strcat>(String(property ), R|properties/constant|)) field:@FIELD:R|properties/Anno|[Types](position = <strcat>(String(field ), R|properties/constant|)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
-            @PROPERTY_GETTER:R|properties/Anno|[Types](position = <strcat>(String(get ), R|properties/constant|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
-            @PROPERTY_SETTER:R|properties/Anno|[Types](position = <strcat>(String(set ), R|properties/constant|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @SETTER_PARAMETER:R|properties/Anno|[Types](position = <strcat>(String(set ), R|properties/constant|)) value: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|): R|kotlin/Unit|
+        @PROPERTY:R|properties/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|properties/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
+            @PROPERTY_GETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+            @PROPERTY_SETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|properties/Anno|[Types](LAZY_EXPRESSION) value: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|): R|kotlin/Unit|
 
         @PROPERTY:R|properties/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|properties/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var unrelatedProperty: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/unrelatedProperty|
             @PROPERTY_GETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.before.txt
index e862f355c82..fc8d92f8336 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructor.before.txt
@@ -1,50 +1,50 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructor.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FIELD|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.after.txt
index 69e0e9de97f..75af79634c2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.after.txt
@@ -1,50 +1,50 @@
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructorScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -69,9 +69,9 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructorScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            @PROPERTY:R|properties/Anno|[Types](position = <strcat>(String(property ), R|properties/constant|)) field:@FIELD:R|properties/Anno|[Types](position = <strcat>(String(field ), R|properties/constant|)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
-                @PROPERTY_GETTER:R|properties/Anno|[Types](position = <strcat>(String(get ), R|properties/constant|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
-                @PROPERTY_SETTER:R|properties/Anno|[Types](position = <strcat>(String(set ), R|properties/constant|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @SETTER_PARAMETER:R|properties/Anno|[Types](position = <strcat>(String(set ), R|properties/constant|)) value: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|): R|kotlin/Unit|
+            @PROPERTY:R|properties/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|properties/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var property: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/property|
+                @PROPERTY_GETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
+                @PROPERTY_SETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|properties/Anno|[Types](LAZY_EXPRESSION) value: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|): R|kotlin/Unit|
 
             @PROPERTY:R|properties/Anno|[Types](LAZY_EXPRESSION) field:@FIELD:R|properties/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var unrelatedProperty: R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>| = R|<local>/unrelatedProperty|
                 @PROPERTY_GETTER:R|properties/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|properties/Anno|(position = <strcat>(String(parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested parameter type: ), R|properties/constant|))  kotlin/collections/List<@R|properties/Anno|(position = <strcat>(String(nested nested parameter type: ), R|properties/constant|))  kotlin/Int>>|
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.before.txt
index a83f6e7d9fa..4969161be63 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/generatedPropertyFromConstructorScript.before.txt
@@ -1,50 +1,50 @@
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirPropertySymbol properties/MyClass.property]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested parameter type: ), constant#))  kotlin/collections/List<@R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 @R|properties/Anno|(<strcat>(String(nested nested parameter type: ), constant#))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol properties/MyClass.property
-  anchor -> [FirValueParameterSymbol <local>/property from FirConstructorSymbol properties/MyClass.MyClass]
+  anchor -> [FirConstructorSymbol properties/MyClass.MyClass]
 
 FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromConstructorScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.after.txt
index 79a02a05b23..8f73ea0215d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.after.txt
@@ -60,7 +60,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.before.txt
index 79a02a05b23..8f73ea0215d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailable.before.txt
@@ -60,7 +60,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.after.txt
index 3c12a934797..006834b4ae8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.after.txt
@@ -96,7 +96,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.before.txt
index 3c12a934797..006834b4ae8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBody.before.txt
@@ -96,7 +96,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.after.txt
index 4ceeed4c0df..0fc0df3b6c3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.after.txt
@@ -96,7 +96,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.before.txt
index 4ceeed4c0df..0fc0df3b6c3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableInImplicitBodyScript.before.txt
@@ -96,7 +96,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.after.txt
index ab6cb64d7e0..eb29cbc51d5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.after.txt
@@ -60,7 +60,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.before.txt
index ab6cb64d7e0..eb29cbc51d5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localImplicitTypeUnavailableScript.before.txt
@@ -60,7 +60,7 @@
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/List<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo]
+  anchor -> [FirPropertySymbol <local>/foo]
 
 @R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/collections/Collection<@R|second/Anno|(str = <getClass>(Q|<local>/A.B.C|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/foo
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.after.txt
index 2771123895a..12ebc3065f1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.after.txt
@@ -1,38 +1,38 @@
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(receiver type ), R|myPack/prop|))  kotlin/collections/List<ERROR CLASS: Incomplete code>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(bound ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested bound ), R|myPack/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested bound ), R|myPack/prop|))  kotlin/String
   context -> FirTypeParameterSymbol T from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 FILE: [ResolvedTo(IMPORTS)] localPropertyWithExplicitType.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.before.txt
index 2771123895a..12ebc3065f1 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/localPropertyWithExplicitType.before.txt
@@ -1,38 +1,38 @@
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(receiver type ), R|myPack/prop|))  kotlin/collections/List<ERROR CLASS: Incomplete code>
   context -> FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(return type ), R|myPack/prop|))  kotlin/collections/Collection<@R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested return type ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested nested return type ), R|myPack/prop|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(bound ), R|myPack/prop|))  kotlin/collections/List<@R|myPack/Anno|(position = <strcat>(String(nested bound ), R|myPack/prop|))  kotlin/String>
   context -> FirTypeParameterSymbol T from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 @R|myPack/Anno|(position = <strcat>(String(nested bound ), R|myPack/prop|))  kotlin/String
   context -> FirTypeParameterSymbol T from FirPropertySymbol <local>/variableToResolve
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol myPack/ttt]
 
 FILE: [ResolvedTo(IMPORTS)] localPropertyWithExplicitType.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.after.txt
index a9aa34df8ea..e0474d6ff71 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.after.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.before.txt
index a9aa34df8ea..e0474d6ff71 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberProperties.before.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.after.txt
index 02114b99ebf..ad01716a95a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.after.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.before.txt
index 02114b99ebf..ad01716a95a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBody.before.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.after.txt
index 60b5d3848fa..32946fec207 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.after.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.before.txt
index 60b5d3848fa..32946fec207 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesImplicitBodyScript.before.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.after.txt
index cae301de2c8..0966bbfda28 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.after.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.before.txt
index cae301de2c8..0966bbfda28 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propagationBetweenLocalMemberPropertiesScript.before.txt
@@ -60,7 +60,7 @@
 
 @R|util/Anno|(str = <strcat>(String(bar ), R|util/prop|))  kotlin/collections/List<@R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>>?
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
-  anchor -> [FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar]
+  anchor -> [FirPropertySymbol <local>/bar]
 
 @R|util/Anno|(str = <strcat>(String(nested bar ), R|util/prop|))  kotlin/collections/Collection<@R|util/Anno|(str = <strcat>(String(nested nested bar ), R|util/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/value from FirPropertyAccessorSymbol special/accessor from FirPropertySymbol <local>/bar
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt
index b2f3ec6bc76..6bc28c9ee67 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.after.txt
@@ -1,38 +1,38 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -57,8 +57,8 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop|
-            public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+        public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop|
+            public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
         public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| {
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass<B>| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt
index b7edf2da554..37a2481d953 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotations.before.txt
@@ -1,38 +1,38 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotations.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt
index a8b53ad6c53..c55b0b12953 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.after.txt
@@ -1,38 +1,38 @@
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -64,8 +64,8 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts
                 LAZY_super<R|kotlin/Any|>
             }
 
-            public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop|
-                public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
+            public final [ResolvedTo(STATUS)] [ComponentFunctionSymbolKey=one/two/MyDataClass.component1, IsFromPrimaryConstructor=true] val prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>| = R|<local>/prop|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=MyDataClass] get(): R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|))  kotlin/Int>>|
 
             public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] B> : R|kotlin/Any| {
                 public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] B>(): R|one/two/MyDataClass.MyClass<B>| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt
index 633f0c18d10..6b3ea22d1ef 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/propertyTypeCollisionAndAnnotationsScript.before.txt
@@ -1,38 +1,38 @@
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirPropertyAccessorSymbol special/accessor from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(0).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirPropertySymbol one/two/MyDataClass.prop]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(1).plus#(constant#))  one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int>
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 @R|one/two/Anno|(IntegerLiteral(2).plus#(constant#))  kotlin/Int
   context -> FirBackingFieldSymbol <local>/field from FirPropertySymbol one/two/MyDataClass.prop
-  anchor -> [FirValueParameterSymbol <local>/prop from FirConstructorSymbol one/two/MyDataClass.MyDataClass]
+  anchor -> [FirConstructorSymbol one/two/MyDataClass.MyDataClass]
 
 FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionAndAnnotationsScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.after.txt
index b5444e1fda0..39e3a22ce15 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.after.txt
@@ -50,3 +50,4 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.before.txt
index b5444e1fda0..39e3a22ce15 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/property/typeParameterAnnotationsInLocalClassScript.before.txt
@@ -50,3 +50,4 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterAnnotationsInLocalClassScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.after.txt
index bbb481f0e5b..4a29d9efab3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.before.txt
index 5268e2c8168..54ae8bc92e9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/function.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.after.txt
index 5995a0f4867..4994224aea2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -105,3 +105,4 @@ FILE: [ResolvedTo(IMPORTS)] functionScript.kts
             @R|second/Anno|[Types](position = <strcat>(String(function ), R|second/constant|)) public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <@R|second/Anno|[Types](position = <strcat>(String(type param ), R|second/constant|)) [ResolvedTo(ANNOTATION_ARGUMENTS)] F : R|@R|second/Anno|(position = <strcat>(String(bound type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested bound type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested nested bound type ), R|second/constant|))  kotlin/String>>|> @RECEIVER:R|second/Anno|[Types](position = <strcat>(String(receiver ), R|second/constant|)) R|@R|second/Anno|(position = <strcat>(String(receiver type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested receiver type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested receiver type ), R|second/constant|))  T>>|.resolveMe([ResolvedTo(ANNOTATION_ARGUMENTS)] @R|second/Anno|[Types](position = <strcat>(String(param ), R|second/constant|)) param: R|@R|second/Anno|(position = <strcat>(String(param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  T>>|): R|@R|second/Anno|(position = <strcat>(String(return type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested return type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested return type ), R|second/constant|))  T>>|
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.before.txt
index f8e79cce03c..01084696679 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionScript.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -105,3 +105,4 @@ FILE: [ResolvedTo(IMPORTS)] functionScript.kts
             @R|second/Anno|[Types](LAZY_EXPRESSION) public abstract [ResolvedTo(STATUS)] fun <@R|second/Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|second/Anno|(<strcat>(String(bound type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested bound type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested nested bound type ), constant#))  kotlin/String>>|> @RECEIVER:R|second/Anno|[Types](LAZY_EXPRESSION) R|@R|second/Anno|(<strcat>(String(receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested receiver type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested receiver type ), constant#))  T>>|.resolveMe([ResolvedTo(STATUS)] @R|second/Anno|[Types](LAZY_EXPRESSION) param: R|@R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  T>>|): R|@R|second/Anno|(<strcat>(String(return type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested return type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested return type ), constant#))  T>>|
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.after.txt
index 34283fc3b22..7194cab8fb4 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.before.txt
index 1e3c5fdad28..aac1c338cc2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailable.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.after.txt
index 3f4bab663bd..ba99a96c394 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -112,3 +112,4 @@ FILE: [ResolvedTo(IMPORTS)] functionUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.before.txt
index 17c3385f987..01b7c9df58d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/functionUnavailableScript.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -112,3 +112,4 @@ FILE: [ResolvedTo(IMPORTS)] functionUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.after.txt
index eb24c0dcb16..0c2cccd8216 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.before.txt
index 56b5a40d030..ab39429b405 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunction.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.after.txt
index 58a7b360172..42cd0dbcff2 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.after.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -111,3 +111,4 @@ FILE: [ResolvedTo(IMPORTS)] implicitFunctionScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.before.txt
index efc5dbc7a4f..3db8140cac5 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionScript.before.txt
@@ -40,15 +40,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -111,3 +111,4 @@ FILE: [ResolvedTo(IMPORTS)] implicitFunctionScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.after.txt
index 4411318abe6..e26d65395c8 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.after.txt
@@ -8,7 +8,7 @@
 
 @R|second/Anno|(position = <strcat>(String(nested nested explicit type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  ERROR CLASS: Symbol not found for T
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.Companion.explicitType]
 
 @R|second/Anno|(position = <strcat>(String(receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -32,15 +32,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.before.txt
index 4c8f8eaed0a..a12842275aa 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailable.before.txt
@@ -8,7 +8,7 @@
 
 @R|second/Anno|(<strcat>(String(nested nested explicit type ), constant#))  ERROR CLASS: Symbol not found for T
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.Companion.explicitType]
 
 @R|second/Anno|(<strcat>(String(receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested receiver type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -32,15 +32,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.after.txt
index 9d347399e1b..7afe77577d3 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.after.txt
@@ -8,7 +8,7 @@
 
 @R|second/Anno|(position = <strcat>(String(nested nested explicit type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  ERROR CLASS: Symbol not found for T
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.Companion.explicitType]
 
 @R|second/Anno|(position = <strcat>(String(receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested receiver type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -32,15 +32,15 @@
 
 @R|second/Anno|(position = <strcat>(String(param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(type argument: ), <Unresolved name: constant>#))  @R|second/Anno|(position = <strcat>(String(nested nested param type ), this@R|second/AbstractClass.Companion|.R|second/AbstractClass.Companion.constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested type argument: ), <Unresolved name: constant>#))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), <Unresolved name: constant>#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -110,3 +110,4 @@ FILE: [ResolvedTo(IMPORTS)] implicitFunctionUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.before.txt
index b82d1a649d5..b6a695956ad 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/implicitFunctionUnavailableScript.before.txt
@@ -8,7 +8,7 @@
 
 @R|second/Anno|(<strcat>(String(nested nested explicit type ), constant#))  ERROR CLASS: Symbol not found for T
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.Companion.explicitType]
 
 @R|second/Anno|(<strcat>(String(receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested receiver type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -32,15 +32,15 @@
 
 @R|second/Anno|(<strcat>(String(param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested param type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested param type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
-  anchor -> [FirRegularClassSymbol second/SubClass, FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/AbstractClass.resolveMe]
+  anchor -> [FirRegularClassSymbol second/SubClass, FirNamedFunctionSymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol second/SubClass.resolveMe
@@ -110,3 +110,4 @@ FILE: [ResolvedTo(IMPORTS)] implicitFunctionUnavailableScript.kts
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.after.txt
index 0708c5725f5..296e196cf8d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.after.txt
@@ -20,7 +20,7 @@
 
 @R|second/Anno|(position = <strcat>(String(receiver type ), R|second/constant|))  ERROR CLASS: Symbol not found for Pair
   context -> FirPropertySymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirPropertySymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(position = <strcat>(String(nested left receiver type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(type argument: ), R|second/constant|))  @R|second/Anno|(position = <strcat>(String(nested nested left receiver type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested type argument: ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested type argument: ), R|second/constant|))  kotlin/String>>>
   context -> FirPropertySymbol second/SubClass.resolveMe
@@ -145,3 +145,4 @@ FILE: [ResolvedTo(IMPORTS)] propertyScript.kts
                 @PROPERTY_SETTER:R|second/Anno|[Types](position = <strcat>(String(set ), R|second/constant|)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=AbstractClass] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @SETTER_PARAMETER:R|second/Anno|[Types](position = <strcat>(String(set ), R|second/constant|)) value: R|@R|second/Anno|(position = <strcat>(String(return type ), R|second/constant|))  kotlin/collections/List<@R|second/Anno|(position = <strcat>(String(nested return type ), R|second/constant|))  kotlin/collections/Collection<@R|second/Anno|(position = <strcat>(String(nested nested return type ), R|second/constant|))  T>>|): R|kotlin/Unit|
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.before.txt
index 10b9bcb6af8..53560a9435b 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/substitutionOverride/propertyScript.before.txt
@@ -20,7 +20,7 @@
 
 @R|second/Anno|(<strcat>(String(receiver type ), constant#))  ERROR CLASS: Symbol not found for Pair
   context -> FirPropertySymbol second/SubClass.resolveMe
-  anchor -> []
+  anchor -> [FirPropertySymbol second/AbstractClass.resolveMe]
 
 @R|second/Anno|(<strcat>(String(nested left receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(type argument: ), constant#))  @R|second/Anno|(<strcat>(String(nested nested left receiver type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested type argument: ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested type argument: ), constant#))  kotlin/String>>>
   context -> FirPropertySymbol second/SubClass.resolveMe
@@ -145,3 +145,4 @@ FILE: [ResolvedTo(IMPORTS)] propertyScript.kts
                 @PROPERTY_SETTER:R|second/Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] set([ResolvedTo(STATUS)] @SETTER_PARAMETER:R|second/Anno|[Types](LAZY_EXPRESSION) value: R|@R|second/Anno|(<strcat>(String(return type ), constant#))  kotlin/collections/List<@R|second/Anno|(<strcat>(String(nested return type ), constant#))  kotlin/collections/Collection<@R|second/Anno|(<strcat>(String(nested nested return type ), constant#))  T>>|): R|kotlin/Unit|
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.after.txt
index 1b1861da22f..dcc076244e9 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.after.txt
@@ -8,11 +8,11 @@
 
 @R|Anno|(position = <strcat>(String(setter type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(setter nested type ), R|/prop|))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething
-  anchor -> [FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething]
+  anchor -> [FirNamedFunctionSymbol /Derived.setSomething]
 
 @R|Anno|(position = <strcat>(String(setter nested type ), R|/prop|))  kotlin/Int
   context -> FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething
-  anchor -> [FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething]
+  anchor -> [FirNamedFunctionSymbol /Derived.setSomething]
 
 @R|Anno|(position = <strcat>(String(getter return type ), R|/prop|))  kotlin/collections/List<@R|Anno|(position = <strcat>(String(getter nested return type ), R|/prop|))  kotlin/Int>
   context -> FirSimpleSyntheticPropertySymbol /Derived.something
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.before.txt
index 73964c219bb..897134a3754 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/syntheticProperty/getterAndSetterWithExplicitReturnType.before.txt
@@ -8,11 +8,11 @@
 
 @R|Anno|(<strcat>(String(setter type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(setter nested type ), prop#))  kotlin/Int>
   context -> FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething
-  anchor -> [FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething]
+  anchor -> [FirNamedFunctionSymbol /Derived.setSomething]
 
 @R|Anno|(<strcat>(String(setter nested type ), prop#))  kotlin/Int
   context -> FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething
-  anchor -> [FirValueParameterSymbol <local>/l from FirNamedFunctionSymbol /Derived.setSomething]
+  anchor -> [FirNamedFunctionSymbol /Derived.setSomething]
 
 @R|Anno|(<strcat>(String(getter return type ), prop#))  kotlin/collections/List<@R|Anno|(<strcat>(String(getter nested return type ), prop#))  kotlin/Int>
   context -> FirSimpleSyntheticPropertySymbol /Derived.something
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.after.txt
index 3b8d7d87f67..ee599d43931 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.after.txt
@@ -1,14 +1,14 @@
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 FILE: [ResolvedTo(IMPORTS)] insideFunctionComplex.kt
     @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class TypeAnnWithArg : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.before.txt
index 54877b31657..ee1342cfd9a 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplex.before.txt
@@ -1,14 +1,14 @@
 @R|pack/TypeAnnWithArg|(<strcat>(String(parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(<strcat>(String(nested parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 FILE: [ResolvedTo(IMPORTS)] insideFunctionComplex.kt
     @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class TypeAnnWithArg : R|kotlin/Annotation| {
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.after.txt
index a8b5ae8fcd2..a9a7325b27d 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.after.txt
@@ -1,14 +1,14 @@
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 FILE: [ResolvedTo(IMPORTS)] insideFunctionComplexScript.kts
     context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
@@ -32,3 +32,4 @@ FILE: [ResolvedTo(IMPORTS)] insideFunctionComplexScript.kts
 
         public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun resolveMe([ResolvedTo(ANNOTATION_ARGUMENTS)] param: R|@R|pack/TypeAnnWithArg|(arg = <strcat>(String(parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested parameter: ), R|pack/constant|))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(arg = <strcat>(String(nested nested parameter: ), R|pack/constant|))  pack/MyTypeAlias>>|): R|kotlin/Unit| {
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.before.txt
index bd581d73169..97848bf5fdd 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/insideFunctionComplexScript.before.txt
@@ -1,14 +1,14 @@
 @R|pack/TypeAnnWithArg|(<strcat>(String(parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias>>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(<strcat>(String(nested parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias>
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 @R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias
   context -> FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe
-  anchor -> [FirValueParameterSymbol <local>/param from FirNamedFunctionSymbol pack/resolveMe]
+  anchor -> [FirNamedFunctionSymbol pack/resolveMe]
 
 FILE: [ResolvedTo(IMPORTS)] insideFunctionComplexScript.kts
     context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
@@ -31,3 +31,4 @@ FILE: [ResolvedTo(IMPORTS)] insideFunctionComplexScript.kts
         public? final [ResolvedTo(RAW_FIR)] typealias MyTypeAlias = @TypeAnnWithArg[Unresolved](LAZY_EXPRESSION) List<@TypeAnnWithArg[Unresolved](LAZY_EXPRESSION) List<@TypeAnnWithArg[Unresolved](LAZY_EXPRESSION) Int>>
 
         public? final? [ResolvedTo(TYPES)] fun resolveMe([ResolvedTo(TYPES)] param: R|@R|pack/TypeAnnWithArg|(<strcat>(String(parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested parameter: ), constant#))  kotlin/collections/List<@R|pack/TypeAnnWithArg|(<strcat>(String(nested nested parameter: ), constant#))  pack/MyTypeAlias>>|): R|kotlin/Unit| { LAZY_BLOCK }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.after.txt
index ef0f258c024..4e5d2883d38 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.after.txt
@@ -1,6 +1,6 @@
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Number
   context -> FirTypeParameterSymbol A from FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
-  anchor -> []
+  anchor -> [FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias]
 
 @R|Anno|(position = <strcat>(String(type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  <local>/OriginalClass<A>
   context -> FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.before.txt
index ef0f258c024..4e5d2883d38 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClass.before.txt
@@ -1,6 +1,6 @@
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Number
   context -> FirTypeParameterSymbol A from FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
-  anchor -> []
+  anchor -> [FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias]
 
 @R|Anno|(position = <strcat>(String(type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  <local>/OriginalClass<A>
   context -> FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.after.txt
index 03e776bff73..3f538de2fc7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.after.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.after.txt
@@ -1,6 +1,6 @@
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Number
   context -> FirTypeParameterSymbol A from FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
-  anchor -> []
+  anchor -> [FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias]
 
 @R|Anno|(position = <strcat>(String(type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  <local>/OriginalClass<A>
   context -> FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
@@ -35,3 +35,4 @@ FILE: [ResolvedTo(IMPORTS)] nestedAliasWithNestedAnnotationInLocalClassScript.kt
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.before.txt
index 03e776bff73..3f538de2fc7 100644
--- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.before.txt
+++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/typeAlias/nestedAliasWithNestedAnnotationInLocalClassScript.before.txt
@@ -1,6 +1,6 @@
 @R|Anno|(position = <strcat>(String(bound ), this@R|<local>/OriginalClass|.R|<local>/prop|))  kotlin/Number
   context -> FirTypeParameterSymbol A from FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
-  anchor -> []
+  anchor -> [FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias]
 
 @R|Anno|(position = <strcat>(String(type ), this@R|<local>/OriginalClass|.R|<local>/prop|))  <local>/OriginalClass<A>
   context -> FirTypeAliasSymbol <local>/OriginalClass.NestedTypeAlias
@@ -35,3 +35,4 @@ FILE: [ResolvedTo(IMPORTS)] nestedAliasWithNestedAnnotationInLocalClassScript.kt
             }
 
         }
+
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLazyTypeAnnotationsTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLazyTypeAnnotationsTest.kt
index 203e7766158..3b16a222520 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLazyTypeAnnotationsTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLazyTypeAnnotationsTest.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
+import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirLazyBlock
 import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol
@@ -24,7 +25,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol
 import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
-import org.jetbrains.kotlin.fir.types.custom
 import org.jetbrains.kotlin.fir.types.customAnnotations
 import org.jetbrains.kotlin.fir.types.forEachType
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
@@ -65,10 +65,8 @@ abstract class AbstractLazyTypeAnnotationsTest : AbstractFirLazyDeclarationResol
             dumpFir(typesWithContext, declaration, firFiles, builderBeforeAnnotationResolve)
 
             typesWithContext.forEach { typeWithContext ->
-                typeWithContext.type.attributes.custom?.let { annotationAttribute ->
-                    annotationAttribute.containerSymbols.forEach { symbol ->
-                        symbol.lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS)
-                    }
+                typeWithContext.type.annotationContainingSymbols().forEach {
+                    it.lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS)
                 }
             }
 
@@ -96,6 +94,10 @@ abstract class AbstractLazyTypeAnnotationsTest : AbstractFirLazyDeclarationResol
     }
 }
 
+private fun ConeKotlinType.annotationContainingSymbols(): List<FirBasedSymbol<*>> = customAnnotations.mapNotNull {
+    (it as? FirAnnotationCall)?.containingDeclarationSymbol
+}
+
 abstract class AbstractSourceLazyTypeAnnotationsTest : AbstractLazyTypeAnnotationsTest() {
     override val configurator = AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false)
 }
@@ -119,7 +121,7 @@ private fun dumpFir(
         builder.append("  context -> ")
         builder.appendLine(typeWithContext.context)
         builder.append("  anchor -> ")
-        builder.appendLine(typeWithContext.type.attributes.custom!!.containerSymbols.map { it.toStringWithContext() })
+        builder.appendLine(typeWithContext.type.annotationContainingSymbols().map { it.toStringWithContext() })
         builder.appendLine()
     }
 
diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt
index 45ced0bc38f..8c57dfe1094 100644
--- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt
+++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/CopyUtils.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.KtSourceElement
 import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.utils.expandedConeType
 import org.jetbrains.kotlin.fir.expressions.*
 import org.jetbrains.kotlin.fir.expressions.builder.FirImplicitInvokeCallBuilder
@@ -72,7 +71,6 @@ fun FirTypeRef.resolvedTypeFromPrototype(
 fun List<FirAnnotation>.computeTypeAttributes(
     session: FirSession,
     predefined: List<ConeAttribute<*>> = emptyList(),
-    containerDeclaration: FirDeclaration? = null,
     allowExtensionFunctionType: Boolean = true,
     shouldExpandTypeAliases: Boolean
 ): ConeAttributes {
@@ -115,7 +113,7 @@ fun List<FirAnnotation>.computeTypeAttributes(
     }
 
     if (customAnnotations.isNotEmpty()) {
-        attributes += CustomAnnotationTypeAttribute(customAnnotations, containerDeclaration?.symbol)
+        attributes += CustomAnnotationTypeAttribute(customAnnotations)
     }
 
     return ConeAttributes.create(attributes)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
index a13732de376..02f181de887 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
@@ -222,7 +222,6 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
         result: TypeResolutionResult,
         areBareTypesAllowed: Boolean,
         topContainer: FirDeclaration?,
-        containerDeclaration: FirDeclaration?,
         isOperandOfIsOperator: Boolean
     ): ConeKotlinType {
         val (symbol, substitutor) = when (result) {
@@ -284,7 +283,6 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
             typeRef.isMarkedNullable,
             typeRef.annotations.computeTypeAttributes(
                 session,
-                containerDeclaration = containerDeclaration,
                 shouldExpandTypeAliases = true,
                 allowExtensionFunctionType = (symbol.toLookupTag() as? ConeClassLikeLookupTag)?.isSomeFunctionType(session) == true,
             )
@@ -373,10 +371,7 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
         return null
     }
 
-    private fun createFunctionType(
-        typeRef: FirFunctionTypeRef,
-        containerDeclaration: FirDeclaration? = null
-    ): FirTypeResolutionResult {
+    private fun createFunctionType(typeRef: FirFunctionTypeRef): FirTypeResolutionResult {
         val parameters =
             typeRef.contextReceiverTypeRefs.map { it.coneType } +
                     listOfNotNull(typeRef.receiverTypeRef?.coneType) +
@@ -406,7 +401,6 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
                     add(CompilerConeAttributes.ContextFunctionTypeParams(typeRef.contextReceiverTypeRefs.size))
                 }
             },
-            containerDeclaration,
             shouldExpandTypeAliases = true
         )
         return FirTypeResolutionResult(
@@ -438,16 +432,14 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
                     result,
                     areBareTypesAllowed,
                     scopeClassDeclaration.topContainer ?: scopeClassDeclaration.containingDeclarations.lastOrNull(),
-                    scopeClassDeclaration.containerDeclaration,
                     isOperandOfIsOperator,
                 )
                 FirTypeResolutionResult(resolvedType, (result as? TypeResolutionResult.Resolved)?.typeCandidate?.diagnostic)
             }
-            is FirFunctionTypeRef -> createFunctionType(typeRef, scopeClassDeclaration.containerDeclaration)
+            is FirFunctionTypeRef -> createFunctionType(typeRef)
             is FirDynamicTypeRef -> {
                 val attributes = typeRef.annotations.computeTypeAttributes(
                     session,
-                    containerDeclaration = scopeClassDeclaration.containerDeclaration,
                     shouldExpandTypeAliases = true
                 )
                 FirTypeResolutionResult(ConeDynamicType.create(session, attributes), diagnostic = null)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt
index 7b012379021..6607bba3ab6 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt
@@ -8,45 +8,16 @@ package org.jetbrains.kotlin.fir.types
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.renderer.FirRenderer
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import kotlin.reflect.KClass
 
-/**
- * @param containerSymbols a list of symbols that should be resolved to make [annotations] are fully resolved.
- * Required only for "lazy" resolve mode in AA FIR to make a type annotation lazily resolved.
- * See KtFirAnnotationListForType for reference.
- * Example:
- * ```kotlin
- * fun foo(): @Anno Type
- * ```
- * This `Anno` annotation will have `foo` function as [containerSymbols].
- * More than one [containerSymbols] possible in case of type aliases:
- * ```kotlin
- * interface BaseInterface
- * typealias FirstTypeAlias = @Anno1 BaseInterface
- * typealias SecondTypeAlias = @Anno2 FirstTypeAlias
- *
- * fun foo(): @Anno3 SecondTypeAlias = TODO()
- * ```
- * here `@Anno3 SecondTypeAlias` will be expanded to ` @Anno1 @Anno2 @Anno3 BaseInterface`
- * and will have all intermediate type-aliases as [containerSymbols].
- */
-class CustomAnnotationTypeAttribute(
-    val annotations: List<FirAnnotation>,
-    val containerSymbols: List<FirBasedSymbol<*>> = emptyList(),
-) : ConeAttribute<CustomAnnotationTypeAttribute>() {
-    constructor(annotations: List<FirAnnotation>, containerSymbol: FirBasedSymbol<*>?) : this(
-        annotations,
-        listOfNotNull(containerSymbol),
-    )
-
+class CustomAnnotationTypeAttribute(val annotations: List<FirAnnotation>) : ConeAttribute<CustomAnnotationTypeAttribute>() {
     override fun union(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute? = null
 
     override fun intersect(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute? = null
 
     override fun add(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute {
         if (other == null || other === this) return this
-        return CustomAnnotationTypeAttribute(annotations + other.annotations, containerSymbols + other.containerSymbols)
+        return CustomAnnotationTypeAttribute(annotations + other.annotations)
     }
 
     override fun isSubtypeOf(other: CustomAnnotationTypeAttribute?): Boolean = true