diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
index fd64b983d42..0f64f61cc1b 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/ambiguityInGroup.fir.kt
@@ -19,9 +19,9 @@ fun supertypeContextual() {}
 
 context(C1, C2)
 fun test() {
-    <!UNRESOLVED_REFERENCE!>supertypeMember<!>()
-    <!UNRESOLVED_REFERENCE!>member<!>()
-    <!UNRESOLVED_REFERENCE!>supertypeExtension<!>()
-    <!UNRESOLVED_REFERENCE!>supertypeExtensionGeneric<!>()
-    supertypeContextual()
-}
\ No newline at end of file
+    supertypeMember()
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>member<!>()
+    <!AMBIGUOUS_CALL_WITH_IMPLICIT_CONTEXT_RECEIVER!>supertypeExtension<!>()
+    <!AMBIGUOUS_CALL_WITH_IMPLICIT_CONTEXT_RECEIVER!>supertypeExtensionGeneric<!>()
+    <!MULTIPLE_ARGUMENTS_APPLICABLE_FOR_CONTEXT_RECEIVER!>supertypeContextual<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/contextualFunctionalTypeConversion.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/contextualFunctionalTypeConversion.fir.kt
index 5bc2e643c86..137fd6d4aa1 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/contextualFunctionalTypeConversion.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/contextualFunctionalTypeConversion.fir.kt
@@ -4,10 +4,10 @@ class A
 class B
 
 fun expectAB(f: context(A, B) () -> Unit) {
-    f(A(), <!TOO_MANY_ARGUMENTS!>B()<!>)
+    f(A(), B())
 }
 
 fun test() {
     val l: context(B, A) () -> Unit = { }
-    expectAB(l)
-}
\ No newline at end of file
+    expectAB(<!ARGUMENT_TYPE_MISMATCH!>l<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt
deleted file mode 100644
index e05ceacec80..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class File(name: String)
-interface InputStream
-
-interface AutoCloseScope {
-    fun defer(closeBlock: () -> Unit)
-    fun close()
-}
-class AutoCloseScopeImpl : AutoCloseScope {
-    override fun defer(closeBlock: () -> Unit) = TODO()
-    override fun close() = TODO()
-}
-
-context(AutoCloseScope)
-fun File.open(): InputStream = TODO()
-
-fun withAutoClose(block: context(AutoCloseScope) () -> Unit) {
-    val scope = AutoCloseScopeImpl() // Not shown here
-    try {
-        with(scope) { block() }
-    } finally {
-        scope.close()
-    }
-}
-
-fun test() {
-    withAutoClose {
-        val input = File("input.txt").open()
-        val config = File("config.txt").open()
-        // Work
-        // All files are closed at the end
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
index 41151bf40e7..82e746dbbdf 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class File(name: String)
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.fir.kt
deleted file mode 100644
index 73578e68610..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-data class Pair<A, B>(val first: A, val second: B)
-
-context(Comparator<T>)
-infix <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun <T> T.compareTo(other: T) = <!UNRESOLVED_REFERENCE!>compare<!>(this, other)
-
-context(Comparator<T>)
-val <T> Pair<T, T>.max get() = if (first > second) first else second
-
-fun test() {
-    val comparator = Comparator<String> { a, b ->
-        if (a == null || b == null) 0 else a.length.compareTo(b.length)
-    }
-    with(comparator) {
-        Pair("OK", "fail").max
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.kt
index 2100f1b35f1..35c21899199 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/compareTo.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 data class Pair<A, B>(val first: A, val second: B)
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.fir.kt
deleted file mode 100644
index de5176ce586..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.fir.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class View
-
-context(View) val Int.dp get() = 42 * this
-
-fun View.f() {
-    123.dp
-    with(123) {
-        dp
-    }
-}
-
-fun Int.g(v: View) {
-    with(v) {
-        dp
-    }
-}
-
-fun h() {
-    123.dp
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.kt
index 5b67b8b4769..cac9f7cceb1 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/dp.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class View
@@ -19,4 +20,4 @@ fun Int.g(v: View) {
 
 fun h() {
     123.<!NO_CONTEXT_RECEIVER!>dp<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/functionalType.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/functionalType.fir.kt
index 52ee444fc67..218ed960cf5 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/functionalType.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/functionalType.fir.kt
@@ -15,7 +15,7 @@ fun Receiver.baz(p: Param) {}
 
 fun main() {
     var g: context(Context) Receiver.(Param) -> Unit
-    g = ::<!UNRESOLVED_REFERENCE!>foo<!>         // OK
-    g = ::bar         // OK
-    g = Receiver::baz // OK
-}
\ No newline at end of file
+    g = ::foo         // OK
+    g = ::<!UNRESOLVED_REFERENCE!>bar<!>         // OK
+    g = Receiver::<!UNRESOLVED_REFERENCE!>baz<!> // OK
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/iterableClass.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/iterableClass.fir.kt
index e64f77dc887..cd5a9c1af5f 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/iterableClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/iterableClass.fir.kt
@@ -3,7 +3,7 @@
 typealias IterableClass<C, T> = (C) -> Iterator<T>
 
 context(IterableClass<C, T>)
-fun <C, T> C.iterator(any: Any?): Iterator<T> = this<!UNRESOLVED_LABEL!>@IterableClass<!>.invoke(this)
+fun <C, T> C.iterator(any: Any?): Iterator<T> = this@IterableClass.invoke(this)
 
 fun <T> listOf(vararg items: T): List<T> = null!!
 
@@ -11,8 +11,8 @@ fun test() {
     val f: IterableClass<List<Int>, Int> = {
         it.listIterator()
     }
-    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>with<!>(f) {
+    with(f) {
         listOf(1, 2, 3).iterator(null)
     }
-    listOf(1, 2, 3).<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>iterator<!>(null)
-}
\ No newline at end of file
+    listOf(1, 2, 3).<!NO_CONTEXT_RECEIVER!>iterator<!>(null)
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.fir.kt
deleted file mode 100644
index 34687792205..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.fir.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class JSONObject {
-    fun build(): JSONObject = TODO()
-
-    fun put(key: String, any: Any): Unit = TODO()
-}
-
-fun json(build: JSONObject.() -> Unit) = JSONObject().apply { build() }
-
-context(JSONObject)
-infix fun String.by(build: JSONObject.() -> Unit) = <!UNRESOLVED_REFERENCE!>put<!>(this, JSONObject().build())
-
-context(JSONObject)
-infix fun String.by(value: Any) = <!UNRESOLVED_REFERENCE!>put<!>(this, value)
-
-fun test() {
-    val json = json {
-        "name" by "Kotlin"
-        "age" by 10
-        "creator" by {
-            "name" by "JetBrains"
-            "age" by "21"
-        }
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.kt
index fd7a91ccfe0..546adfd4747 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/json.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class JSONObject {
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.fir.kt
deleted file mode 100644
index 577fb8d1052..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.fir.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-interface Params
-interface Logger {
-    fun info(message: String)
-}
-interface LoggingContext {
-    val log: Logger // this context provides reference to logger
-}
-
-context(LoggingContext)
-fun performSomeBusinessOperation(withParams: Params) {
-    <!UNRESOLVED_REFERENCE!>log<!>.info("Operation has started")
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.kt
index 985e3677f5f..646984ea087 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/loggingContext.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 interface Params
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/monoidSum.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/monoidSum.fir.kt
index 179176e19ba..18ae34d9070 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/monoidSum.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/monoidSum.fir.kt
@@ -19,7 +19,7 @@ object StringMonoid : Monoid<String> {
 public inline fun <T, R> Iterable<T>.fold(initial: R, operation: (acc: R, T) -> R): R = TODO()
 
 context(Monoid<T>)
-fun <T> List<T>.sum(): T = fold(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unit<!>) { acc, e -> acc.<!UNRESOLVED_REFERENCE!>combine<!>(e) }
+fun <T> List<T>.sum(): T = fold(unit) { acc, e -> acc.combine(e) }
 
 fun <T> listOf(vararg items: T): List<T> = null!!
 
@@ -28,7 +28,7 @@ fun test() {
         listOf(1, 2, 3).sum()
     }
     with(StringMonoid) {
-        listOf(1, 2, 3).sum()
+        listOf(1, 2, 3).<!NO_CONTEXT_RECEIVER!>sum<!>()
         listOf("1", "2", "3").sum()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.fir.kt
deleted file mode 100644
index a7f271d1271..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class Session(var lastAccess: Any?)
-interface Transaction {
-    fun loadSession(): Session
-    fun storeSession(session: Session)
-}
-
-fun now(): Any? = null
-
-context(Transaction)
-fun updateUserSession() {
-    val session = <!UNRESOLVED_REFERENCE!>loadSession<!>()
-    session.<!UNRESOLVED_REFERENCE!>lastAccess<!> = now()
-    <!UNRESOLVED_REFERENCE!>storeSession<!>(session)
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.kt
index 19af7d62403..4dc7724510e 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/transaction.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class Session(var lastAccess: Any?)
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.fir.kt
deleted file mode 100644
index 17cf4d280e8..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.fir.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class Storage<T> {
-    inner class Info
-
-    fun info(name: String) = Info()
-}
-class User
-class Logger {
-    fun info(message: String) {}
-}
-
-context(Logger, Storage<User>)
-fun userInfo(name: String): Storage<User>.Info? {
-    this<!UNRESOLVED_LABEL!>@Logger<!>.info("Retrieving info about $name")
-    return this<!UNRESOLVED_LABEL!>@Storage<!>.info(name)
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.kt
index 99c66ed8ad2..526cfda3b49 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/userStorage.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class Storage<T> {
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/functionalType.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/functionalType.fir.kt
index 5708bd4e615..673a2c54278 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/functionalType.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/functionalType.fir.kt
@@ -10,38 +10,38 @@ class R {
 
 context(C)
 fun R.f1(g: context(C) R.(Param) -> Unit) {
-    g(this<!UNRESOLVED_LABEL!>@C<!>, this<!UNRESOLVED_LABEL!>@R<!>, <!TOO_MANY_ARGUMENTS!>Param()<!>)
+    g(this@C, this<!UNRESOLVED_LABEL!>@R<!>, Param())
 }
 
 context(C)
 fun f2(g: context(C) (Param) -> Unit) {
-    g(this<!UNRESOLVED_LABEL!>@C<!>, Param())
+    g(this@C, Param())
 }
 
 context(C)
 fun R.f3(g: context(C) R.() -> Unit) {
-    g(this<!UNRESOLVED_LABEL!>@C<!>, <!TOO_MANY_ARGUMENTS!>this<!UNRESOLVED_LABEL!>@R<!><!>)
+    g(this@C, this<!UNRESOLVED_LABEL!>@R<!>)
 }
 
 context(C)
 fun f4(g: context(C) () -> Unit) {
-    g(this<!UNRESOLVED_LABEL!>@C<!>)
+    g(this@C)
 }
 
 fun test() {
     val lf1: context(C) R.(Param) -> Unit = { _ ->
         r
-        <!UNRESOLVED_REFERENCE!>c<!>
+        c
     }
     val lf2: context(C) (Param) -> Unit = { _ ->
-        <!UNRESOLVED_REFERENCE!>c<!>
+        c
     }
     val lf3: context(C) R.() -> Unit = {
         r
-        <!UNRESOLVED_REFERENCE!>c<!>
+        c
     }
     val lf4: context(C) () -> Unit = {
-        <!UNRESOLVED_REFERENCE!>c<!>
+        c
     }
 
     with(C()) {
@@ -69,4 +69,4 @@ fun test() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/genericOuterClass.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/genericOuterClass.kt
index 08c2ef0a6ef..612671fac5b 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/genericOuterClass.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/genericOuterClass.kt
@@ -6,10 +6,10 @@ context(Collection<P>) class B<P>
 
 fun Int.foo() {
     A<Int>()
-    <!NO_CONTEXT_RECEIVER!>A<String>()<!>
+    <!NO_CONTEXT_RECEIVER!>A<!><String>()
 }
 
 fun Collection<Int>.bar() {
     B<Int>()
-    <!NO_CONTEXT_RECEIVER!>B<String>()<!>
-}
\ No newline at end of file
+    <!NO_CONTEXT_RECEIVER!>B<!><String>()
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.fir.kt
deleted file mode 100644
index 63517d7de7d..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.fir.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class A {
-    fun h1() {}
-}
-
-class B {
-    fun h2() {}
-}
-
-fun B.foo() {
-    <!UNRESOLVED_REFERENCE!>h1<!>()
-    h2()
-}
-
-context(A)
-fun B.bar() {
-    <!UNRESOLVED_REFERENCE!>h1<!>()
-    h2()
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt
index 0c812dfa399..1a1365b7c48 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/insideDeclaration.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/labelsFromClassNameForbidden.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/labelsFromClassNameForbidden.fir.kt
index cbedd3274ee..be6d6a56eac 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/labelsFromClassNameForbidden.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/labelsFromClassNameForbidden.fir.kt
@@ -4,9 +4,9 @@ fun List<Int>.f() {
 
 context(String)
 fun Int.f() {
-    this<!UNRESOLVED_LABEL!>@String<!>.length
+    this@String.length
     this<!UNRESOLVED_LABEL!>@Int<!>.toDouble()
 }
 
 context(String)
-val p: String get() = this<!UNRESOLVED_LABEL!>@String<!>
\ No newline at end of file
+val p: String get() = this@String
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lazy.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lazy.fir.kt
index 3b3b3800f02..57be36ed83f 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lazy.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lazy.fir.kt
@@ -15,36 +15,36 @@ fun <T> f(lazy1: Lazy<Int>, lazy2: Lazy<CharSequence>, lazyT: Lazy<T>, lazyLazyT
     with(lazy1) {
         with(lazy2) {
             test1()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
+            test2()
+            <!NO_CONTEXT_RECEIVER!>test3<!>()
         }
     }
     with(lazy2) {
         with(lazy1) {
             test1()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
+            test2()
+            <!NO_CONTEXT_RECEIVER!>test3<!>()
         }
     }
     with(lazyT) {
         with(lazy1) {
-            test1()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
+            <!NO_CONTEXT_RECEIVER!>test1<!>()
+            test2()
+            <!NO_CONTEXT_RECEIVER!>test3<!>()
         }
     }
     with(lazyLazyT) {
         with(lazy1) {
-            test1()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
+            <!NO_CONTEXT_RECEIVER!>test1<!>()
+            test2()
+            test3()
         }
     }
     with(lazy1) {
         with(lazyLazyT) {
-            test1()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test2<!>()
-            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>()
+            <!NO_CONTEXT_RECEIVER!>test1<!>()
+            test2()
+            test3()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.fir.kt
deleted file mode 100644
index 6721c8d7a05..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.fir.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class A {
-    val a = 1
-}
-
-class B {
-    val b = 2
-}
-
-class C {
-    val c = 3
-}
-
-context(A, B) fun C.f() {}
-
-fun main(a: A, b: B, c: C) {
-    with(a) {
-        with(b) {
-            with(c) {
-                f()
-            }
-        }
-    }
-    with(b) {
-        with(c) {
-            with(a) {
-                f()
-            }
-        }
-    }
-    with(a) {
-        with(c) {
-            f()
-        }
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.kt
index 2a674f33d4e..b53ece5a6a1 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/manyReceivers.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class A {
@@ -31,7 +32,7 @@ fun main(a: A, b: B, c: C) {
     }
     with(a) {
         with(c) {
-            <!NO_CONTEXT_RECEIVER!>f()<!>
+            <!NO_CONTEXT_RECEIVER!>f<!>()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/noBackingField.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/noBackingField.fir.kt
index d91e6f55f02..4be7bda1df3 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/noBackingField.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/noBackingField.fir.kt
@@ -14,4 +14,4 @@ context(A, B)
 var b = 2
 
 context(A, B)
-val c get() = <!UNRESOLVED_REFERENCE!>a<!>() + <!UNRESOLVED_REFERENCE!>b<!>()
\ No newline at end of file
+val c get() = a() + b()
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.fir.kt
index 200a7626c35..355ea33434f 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.fir.kt
@@ -7,7 +7,7 @@ class Outer {
 
 context(Outer)
 class Inner(arg: Any) {
-    fun bar() = <!UNRESOLVED_REFERENCE!>x<!>
+    fun bar() = x
 }
 
 fun f(outer: Outer) {
@@ -15,4 +15,4 @@ fun f(outer: Outer) {
     with(outer) {
         Inner(3)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.kt
index a5b4a4baafd..4ab38d4d86e 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/outerClass.kt
@@ -11,8 +11,8 @@ class Inner(arg: Any) {
 }
 
 fun f(outer: Outer) {
-    <!NO_CONTEXT_RECEIVER!>Inner(1)<!>
+    <!NO_CONTEXT_RECEIVER!>Inner<!>(1)
     with(outer) {
         Inner(3)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/overloading.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/overloading.fir.kt
index d982b1d1ada..ffc46fdf3c5 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/overloading.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/overloading.fir.kt
@@ -2,16 +2,16 @@
 
 <!CONFLICTING_OVERLOADS!>context(Int, String)
 fun foo(): Int<!> {
-    return <!RETURN_TYPE_MISMATCH!>this<!UNRESOLVED_LABEL!>@Int<!> + 42<!>
+    return this@Int + 42
 }
 
 <!CONFLICTING_OVERLOADS!>context(Int)
 fun foo(): Int<!> {
-    return <!RETURN_TYPE_MISMATCH!>this<!UNRESOLVED_LABEL!>@Int<!> + 42<!>
+    return this@Int + 42
 }
 
 fun test() {
     with(42) {
         foo()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisIdentifierInfo.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisIdentifierInfo.fir.kt
index e57b44c2246..62b9b29a1b5 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisIdentifierInfo.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisIdentifierInfo.fir.kt
@@ -3,6 +3,6 @@
 class A(val a: String?)
 
 context(A) fun f() {
-    if (this<!UNRESOLVED_LABEL!>@A<!>.a == null) return
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
-}
\ No newline at end of file
+    if (this@A.a == null) return
+    this@A.a.length
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithCustomLabel.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithCustomLabel.fir.kt
index 68e773638ef..d4fc4295aeb 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithCustomLabel.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithCustomLabel.fir.kt
@@ -5,20 +5,20 @@ class B(val b: Any)
 class C(val c: Any)
 
 context(labelAInt@A<Int>, A<String>, labelB@B) fun f() {
-    this<!UNRESOLVED_LABEL!>@labelAInt<!>.a.toFloat()
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
-    this<!UNRESOLVED_LABEL!>@labelB<!>.b
+    this@labelAInt.a.toFloat()
+    this@A.a.length
+    this@labelB.b
     this<!UNRESOLVED_LABEL!>@B<!>
 }
 
 context(labelAInt@A<Int>, A<String>, labelB@B) val C.p: Int
     get() {
-        this<!UNRESOLVED_LABEL!>@labelAInt<!>.a.toFloat()
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
+        this@labelAInt.a.toFloat()
+        this@A.a.length
         this<!UNRESOLVED_LABEL!>@B<!>
-        this<!UNRESOLVED_LABEL!>@labelB<!>.b
+        this@labelB.b
         this<!UNRESOLVED_LABEL!>@C<!>.c
         this@p.c
         this.c
         return 1
-    }
\ No newline at end of file
+    }
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.fir.kt
deleted file mode 100644
index 8a135fa747d..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class A {
-    val x = 1
-}
-
-context(A) class B {
-    val prop = <!UNRESOLVED_REFERENCE!>x<!> + this<!UNRESOLVED_LABEL!>@A<!>.x
-
-    fun f() = <!UNRESOLVED_REFERENCE!>x<!> + this<!UNRESOLVED_LABEL!>@A<!>.x
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.kt
index 8cbf90106a2..5525f2da36b 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsFunctions.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsFunctions.fir.kt
index 2310245ddf0..1d019f9c5a8 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsFunctions.fir.kt
@@ -5,25 +5,25 @@ class B(val b: Any)
 class C(val c: Any)
 
 context(A<String>) fun A<Int>.f() {
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
+    this@A.a.length
 }
 
 <!CONFLICTING_OVERLOADS!>context(A<String>, B) fun f()<!> {
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
-    this<!UNRESOLVED_LABEL!>@B<!>.b
+    this@A.a.length
+    this@B.b
     <!NO_THIS!>this<!>
 }
 
 <!CONFLICTING_OVERLOADS!>context(A<Int>, A<String>, B) fun f()<!> {
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
-    this<!UNRESOLVED_LABEL!>@B<!>.b
+    this@A.a.length
+    this@B.b
     <!NO_THIS!>this<!>
 }
 
 context(A<Int>, A<String>, B) fun C.f() {
-    this<!UNRESOLVED_LABEL!>@A<!>.a.length
-    this<!UNRESOLVED_LABEL!>@B<!>.b
+    this@A.a.length
+    this@B.b
     this<!UNRESOLVED_LABEL!>@C<!>.c
     this@f.c
     this.c
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsProperties.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsProperties.fir.kt
index e07422625ab..1b683584a00 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsProperties.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsProperties.fir.kt
@@ -6,39 +6,39 @@ class C(val c: Any)
 
 <!MUST_BE_INITIALIZED!>context(A<String>, B) var <!REDECLARATION!>p<!>: Int<!>
     get() {
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
-        this<!UNRESOLVED_LABEL!>@B<!>.b
+        this@A.a.length
+        this@B.b
         <!NO_THIS!>this<!>
         return 1
     }
     set(value) {
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
-        this<!UNRESOLVED_LABEL!>@B<!>.b
+        this@A.a.length
+        this@B.b
         <!NO_THIS!>this<!>
         field = value
     }
 
 <!MUST_BE_INITIALIZED!>context(A<Int>, A<String>, B) var <!REDECLARATION!>p<!>: Int<!>
     get() {
-        this<!UNRESOLVED_LABEL!>@A<!>.a.toDouble()
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
-        this<!UNRESOLVED_LABEL!>@B<!>.b
+        this@A.a.<!UNRESOLVED_REFERENCE!>toDouble<!>()
+        this@A.a.length
+        this@B.b
         <!NO_THIS!>this<!>
         return 1
     }
     set(value) {
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
-        this<!UNRESOLVED_LABEL!>@B<!>.b
+        this@A.a.length
+        this@B.b
         <!NO_THIS!>this<!>
         field = value
     }
 
 context(A<Int>, A<String>, B) val C.p: Int
     get() {
-        this<!UNRESOLVED_LABEL!>@A<!>.a.length
-        this<!UNRESOLVED_LABEL!>@B<!>.b
+        this@A.a.length
+        this@B.b
         this<!UNRESOLVED_LABEL!>@C<!>.c
         this@p.c
         this.c
         return 1
-    }
\ No newline at end of file
+    }
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterizedList.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterizedList.fir.kt
index e45a458bac6..fd4ef3c5689 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterizedList.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/typeParameterizedList.fir.kt
@@ -13,6 +13,6 @@ fun main() {
         A<Int>().f()
     }
     with(listOf("1", "2", "3")) {
-        A<Int>().f()
+        A<Int>().<!NO_CONTEXT_RECEIVER!>f<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiver.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiver.fir.kt
index 487ff5fd018..39e27c18cb6 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiver.fir.kt
@@ -10,11 +10,11 @@ fun B.f() {}
 fun main() {
     val b = B()
 
-    b.f()
+    b.<!NO_CONTEXT_RECEIVER!>f<!>()
     with(A()) {
         b.f()
     }
     with(C()) {
         b.f()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiverError.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiverError.fir.kt
index 94124cdd290..d28da3252be 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiverError.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/withExplicitReceiverError.fir.kt
@@ -10,11 +10,11 @@ fun B.f() {}
 fun main() {
     val b = B()
 
-    b.f()
+    b.<!NO_CONTEXT_RECEIVER!>f<!>()
     with(A()) {
         b.f()
     }
     with(C()) {
-        b.f()
+        b.<!NO_CONTEXT_RECEIVER!>f<!>()
     }
-}
\ No newline at end of file
+}