diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt
new file mode 100644
index 00000000000..e8c7b83bd78
--- /dev/null
+++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt
@@ -0,0 +1,63 @@
+interface IFoo {
+  @Deprecated(message = "")
+  val prop: String
+    get(): String {
+      return ""
+    }
+
+  @Deprecated(message = "")
+  val String.extProp: String
+    get(): String {
+      return ""
+    }
+
+}
+
+class Delegated : IFoo {
+  constructor(foo: IFoo) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  private /*final field*/ val $$delegate_0: IFoo = foo
+  override val String.extProp: String
+    override get(): String {
+      return (<this>.#$$delegate_0, <this>).<get-extProp>()
+    }
+
+  override val prop: String
+    override get(): String {
+      return <this>.#$$delegate_0.<get-prop>()
+    }
+
+}
+
+class DefaultImpl : IFoo {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+}
+
+class ExplicitOverride : IFoo {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  override val prop: String
+    override get(): String {
+      return ""
+    }
+
+  override val String.extProp: String
+    override get(): String {
+      return ""
+    }
+
+}
+
diff --git a/compiler/testData/ir/irText/expressions/kt37570.kt.txt b/compiler/testData/ir/irText/expressions/kt37570.kt.txt
index 9aaad6bc15a..ed1901631b0 100644
--- a/compiler/testData/ir/irText/expressions/kt37570.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt37570.kt.txt
@@ -14,7 +14,7 @@ class A {
 
   init {
     a().apply<String>(block = local fun String.<anonymous>() {
-      <this>.#b = <this>
+      <this>.#b = $this$apply
     }
 ) /*~> Unit */
   }
diff --git a/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt.txt b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt.txt
new file mode 100644
index 00000000000..a0a73d61825
--- /dev/null
+++ b/compiler/testData/ir/irText/expressions/objectByNameInsideObject.kt.txt
@@ -0,0 +1,33 @@
+open class Base {
+  constructor(f1: Function0<Any>) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  val f1: Function0<Any>
+    field = f1
+    get
+
+}
+
+object Thing : Base {
+  private constructor() /* primary */ {
+    super/*Base*/(f1 = local fun <anonymous>(): Any {
+      return Thing
+    }
+)
+    /* <init>() */
+
+  }
+
+  fun test1(): Thing {
+    return Thing
+  }
+
+  fun test2(): Thing {
+    return <this>
+  }
+
+}
+
diff --git a/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt b/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
index 05f10d40798..0ace4e94f32 100644
--- a/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/AllCandidates.kt.txt
@@ -22,7 +22,7 @@ class MyCandidate {
 
 private fun <A : Any?> allCandidatesResult(allCandidates: Collection<MyCandidate>): @FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>? {
   return nameNotFound<@FlexibleNullability A?>().apply<@FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?>(block = local fun @FlexibleNullability OverloadResolutionResultsImpl<@FlexibleNullability A?>?.<anonymous>() {
-    <this> /*!! OverloadResolutionResultsImpl<@FlexibleNullability A?> */.setAllCandidates<@FlexibleNullability A?>(allCandidates = allCandidates.map<MyCandidate, ResolvedCall<A>>(transform = local fun <anonymous>(it: MyCandidate): ResolvedCall<A> {
+    $this$apply /*!! OverloadResolutionResultsImpl<@FlexibleNullability A?> */.setAllCandidates<@FlexibleNullability A?>(allCandidates = allCandidates.map<MyCandidate, ResolvedCall<A>>(transform = local fun <anonymous>(it: MyCandidate): ResolvedCall<A> {
       return it.<get-resolvedCall>() as ResolvedCall<A>
     }
 ))
diff --git a/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt.txt b/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt.txt
new file mode 100644
index 00000000000..d1a6dd83c81
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/throwableStackTrace.kt.txt
@@ -0,0 +1,4 @@
+fun foo(t: Throwable) {
+  t.setStackTrace(p0 = t.getStackTrace())
+}
+
diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.kt.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.kt.txt
index 28590b02683..b353ca3f2b1 100644
--- a/compiler/testData/ir/irText/lambdas/extensionLambda.kt.txt
+++ b/compiler/testData/ir/irText/lambdas/extensionLambda.kt.txt
@@ -1,6 +1,6 @@
 fun test1(): Int {
   return "42".run<String, Int>(block = local fun String.<anonymous>(): Int {
-    return <this>.<get-length>()
+    return $this$run.<get-length>()
   }
 )
 }
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
index 994146b75c1..c44b81ee74d 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.kt.txt
@@ -35,7 +35,7 @@ fun test(fooImpl: IFoo, invokeImpl: IInvoke) {
   with<A, Int>(receiver = A, block = local fun A.<anonymous>(): Int {
     return with<IFoo, Int>(receiver = fooImpl, block = local fun IFoo.<anonymous>(): Int {
       return with<IInvoke, Int>(receiver = invokeImpl, block = local fun IInvoke.<anonymous>(): Int {
-        return (<this>, (<this>, <this>).<get-foo>()).invoke()
+        return ($this$with, ($this$with, $this$with).<get-foo>()).invoke()
       }
 )
     }
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.kt.txt b/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
index 1d81be4db90..ab00f71891f 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
@@ -2,7 +2,7 @@ fun <K1 : Any?, V1 : Any?> Map<out K1, V1>.plus(pair: Pair<K1, V1>): Map<K1, V1>
   return when {
     <this>.isEmpty() -> mapOf<K1, V1>(pair = pair)
     else -> LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>(p0 = <this>).apply<LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>>(block = local fun LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>.<anonymous>() {
-      <this>.put(key = pair.<get-first>(), value = pair.<get-second>()) /*~> Unit */
+      $this$apply.put(key = pair.<get-first>(), value = pair.<get-second>()) /*~> Unit */
     }
 )
   }
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
index c48ec96ef9d..149e016f412 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
@@ -1,9 +1,9 @@
 @OptIn(markerClass = [ExperimentalTypeInference::class])
 fun <R : Any?> scopedFlow(@BuilderInference block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
   return flow<R>(block = local suspend fun FlowCollector<R>.<anonymous>() {
-    val collector: FlowCollector<R> = <this>
+    val collector: FlowCollector<R> = $this$flow
     flowScope<Unit>(block = local suspend fun CoroutineScope.<anonymous>() {
-      block.invoke(p1 = <this>, p2 = collector)
+      block.invoke(p1 = $this$flowScope, p2 = collector)
     }
 )
   }
@@ -12,7 +12,7 @@ fun <R : Any?> scopedFlow(@BuilderInference block: @ExtensionFunctionType Suspen
 
 fun <T : Any?> Flow<T>.onCompletion(action: @ExtensionFunctionType SuspendFunction2<FlowCollector<T>, @ParameterName(name = "cause") Throwable?, Unit>): Flow<T> {
   return unsafeFlow<T>(block = local suspend fun FlowCollector<T>.<anonymous>() {
-    val safeCollector: SafeCollector<T> = SafeCollector<T>(collector = <this>)
+    val safeCollector: SafeCollector<T> = SafeCollector<T>(collector = $this$unsafeFlow)
     safeCollector.invokeSafely<T>(action = action)
   }
 )
@@ -36,7 +36,7 @@ fun <T : Any?> Flow<T>.onCompletion(action: SuspendFunction1<@ParameterName(name
 
 private fun CoroutineScope.asFairChannel(flow: Flow<*>): ReceiveChannel<Any> {
   return <this>.produce<Any>(block = local suspend fun ProducerScope<Any>.<anonymous>() {
-    val channel: ChannelCoroutine<Any> = <this>.<get-channel>() as ChannelCoroutine<Any>
+    val channel: ChannelCoroutine<Any> = $this$produce.<get-channel>() as ChannelCoroutine<Any>
     flow.collect<Any?>(action = local suspend fun <anonymous>(value: Any?) {
       return channel.sendFair(element = { // BLOCK
         val tmp0_elvis_lhs: Any? = value
@@ -54,7 +54,7 @@ private fun CoroutineScope.asFairChannel(flow: Flow<*>): ReceiveChannel<Any> {
 private fun CoroutineScope.asChannel(flow: Flow<*>): ReceiveChannel<Any> {
   return <this>.produce<Any>(block = local suspend fun ProducerScope<Any>.<anonymous>() {
     flow.collect<Any?>(action = local suspend fun <anonymous>(value: Any?) {
-      return <this>.<get-channel>().send(e = { // BLOCK
+      return $this$produce.<get-channel>().send(e = { // BLOCK
         val tmp0_elvis_lhs: Any? = value
         when {
           EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> Any()