diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
index 00ad568f6a1..768784939f9 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
+++ b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
@@ -20,7 +20,7 @@ public class J {
 import p.*
 
 class K: J.C() {
-    fun <!UNSUPPORTED, DYNAMIC_RECEIVER_NOT_ALLOWER!>dynamic<!>.test() {
+    fun <!UNSUPPORTED, DYNAMIC_RECEIVER_NOT_ALLOWED!>dynamic<!>.test() {
         <!DEBUG_INFO_DYNAMIC!>sam<!>(null)
         <!DEBUG_INFO_DYNAMIC!>sam<!>(
             name = null,
diff --git a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
index 10366bd49f4..85f280871a4 100644
--- a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
@@ -8,8 +8,8 @@ fun bar(a: dynamic) {
 
 Resolved call:
 
-Resulting descriptor: fun dynamic.foo(): Unit defined in root package
+Resulting descriptor: fun foo(): dynamic defined in bar
 
-Explicit receiver kind = EXTENSION_RECEIVER
-Dispatch receiver = NO_RECEIVER
-Extension receiver = a {dynamic}
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = a {dynamic}
+Extension receiver = NO_RECEIVER
diff --git a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
index 36f5469aee0..995e2f12681 100644
--- a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
+++ b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
@@ -12,8 +12,8 @@ fun bar(a: A, b: dynamic) {
 
 Resolved call:
 
-Resulting descriptor: fun dynamic.foo(): Unit defined in A
+Resulting descriptor: fun foo(): dynamic defined in bar.<anonymous>
 
-Explicit receiver kind = EXTENSION_RECEIVER
-Dispatch receiver = AExt{fun A.<anonymous>(): Unit defined in bar}
-Extension receiver = b {dynamic}
+Explicit receiver kind = DISPATCH_RECEIVER
+Dispatch receiver = b {dynamic}
+Extension receiver = NO_RECEIVER
diff --git a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
index a876a235e3a..766b216f337 100644
--- a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
@@ -14,8 +14,8 @@ fun bar(a: A, b: dynamic) {
 
 Resolved call:
 
-Resulting descriptor: fun dynamic.foo(): Unit defined in A
+Resulting descriptor: fun foo(): dynamic defined in bar.<anonymous>.<anonymous>
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-Dispatch receiver = AExt{fun A.<anonymous>(): Unit defined in bar}
-Extension receiver = dynamicExt{fun dynamic.<anonymous>(): Unit defined in bar.<anonymous>}
+Dispatch receiver = dynamicExt{fun dynamic.<anonymous>(): dynamic defined in bar.<anonymous>}
+Extension receiver = NO_RECEIVER
diff --git a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
index eb22771ca84..9f549433928 100644
--- a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
@@ -8,8 +8,8 @@ fun dynamic.bar() {
 
 Resolved call:
 
-Resulting descriptor: fun dynamic.foo(): Unit defined in root package
+Resulting descriptor: fun foo(): dynamic defined in bar
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
-Dispatch receiver = NO_RECEIVER
-Extension receiver = dynamicExt{fun dynamic.bar(): Unit defined in root package}
+Dispatch receiver = dynamicExt{fun dynamic.bar(): Unit defined in root package}
+Extension receiver = NO_RECEIVER
diff --git a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
index d16b058406a..45b641a70b2 100644
--- a/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
+++ b/idea/testData/hierarchy/withLib/annotation/Annotation_verification.xml
@@ -1,65 +1,66 @@
 <node text="Annotation (java.lang.annotation)" base="true">
-  <node text="AllowSuspendExtensions (kotlin.coroutines)"/>
+  <node text="Override (java.lang)"/>
+  <node text="Language (org.intellij.lang.annotations)"/>
+  <node text="SuppressWarnings (java.lang)"/>
   <node text="Deprecated (java.lang)"/>
-  <node text="Deprecated (kotlin)"/>
-  <node text="Documented (java.lang.annotation)"/>
-  <node text="DslMarker (kotlin)"/>
-  <node text="Exact (kotlin.internal)"/>
-  <node text="ExtensionFunctionType (kotlin)"/>
-  <node text="HidesMembers (kotlin.internal)"/>
-  <node text="Identifier (org.intellij.lang.annotations)"/>
   <node text="Inherited (java.lang.annotation)"/>
-  <node text="InlineOnly (kotlin.internal)"/>
-  <node text="JvmField (kotlin.jvm)"/>
-  <node text="JvmMultifileClass (kotlin.jvm)"/>
-  <node text="JvmName (kotlin.jvm)"/>
-  <node text="JvmOverloads (kotlin.jvm)"/>
-  <node text="JvmStatic (kotlin.jvm)"/>
+  <node text="NonNls (org.jetbrains.annotations)"/>
+  <node text="Target (java.lang.annotation)"/>
+  <node text="Mutable (org.jetbrains.annotations)"/>
+  <node text="Subst (org.intellij.lang.annotations)"/>
+  <node text="Retention (java.lang.annotation)"/>
+  <node text="TestOnly (org.jetbrains.annotations)"/>
+  <node text="Nullable (org.jetbrains.annotations)"/>
+  <node text="Nullable (org.jetbrains.annotations)"/>
+  <node text="ReadOnly (org.jetbrains.annotations)"/>
+  <node text="Nls (org.jetbrains.annotations)"/>
+  <node text="Identifier (org.intellij.lang.annotations)"/>
+  <node text="PrintFormat (org.intellij.lang.annotations)"/>
+  <node text="RegExp (org.intellij.lang.annotations)"/>
+  <node text="Documented (java.lang.annotation)"/>
+  <node text="Pattern (org.intellij.lang.annotations)"/>
+  <node text="PropertyKey (org.jetbrains.annotations)"/>
+  <node text="NotNull (org.jetbrains.annotations)"/>
+  <node text="NotNull (org.jetbrains.annotations)"/>
+  <node text="Transient (kotlin.jvm)"/>
+  <node text="Throws (kotlin.jvm)"/>
+  <node text="PurelyImplements (kotlin.jvm)"/>
   <node text="JvmSuppressWildcards (kotlin.jvm)"/>
   <node text="JvmSynthetic (kotlin.jvm)"/>
-  <node text="JvmVersion (kotlin.jvm)"/>
   <node text="JvmWildcard (kotlin.jvm)"/>
-  <node text="Language (org.intellij.lang.annotations)"/>
+  <node text="JvmVersion (kotlin.jvm)"/>
+  <node text="Strictfp (kotlin.jvm)"/>
+  <node text="JvmMultifileClass (kotlin.jvm)"/>
+  <node text="JvmStatic (kotlin.jvm)"/>
+  <node text="Volatile (kotlin.jvm)"/>
+  <node text="JvmOverloads (kotlin.jvm)"/>
+  <node text="JvmField (kotlin.jvm)"/>
+  <node text="JvmName (kotlin.jvm)"/>
+  <node text="Synchronized (kotlin.jvm)"/>
+  <node text="Exact (kotlin.internal)"/>
+  <node text="HidesMembers (kotlin.internal)"/>
+  <node text="NoInfer (kotlin.internal)"/>
+  <node text="InlineOnly (kotlin.internal)"/>
   <node text="LowPriorityInOverloadResolution (kotlin.internal)"/>
-  <node text="Metadata (kotlin)"/>
+  <node text="PlatformDependent (kotlin.internal)"/>
+  <node text="PureReifiable (kotlin.internal)"/>
+  <node text="OnlyInputTypes (kotlin.internal)"/>
+  <node text="DynamicExtension (kotlin.internal)"/>
+  <node text="Target (kotlin.annotation)"/>
+  <node text="Retention (kotlin.annotation)"/>
+  <node text="Repeatable (kotlin.annotation)"/>
   <node text="MustBeDocumented (kotlin.annotation)"/>
-  <node text="Mutable (org.jetbrains.annotations)"/>
+  <node text="AllowSuspendExtensions (kotlin.coroutines)"/>
+  <node text="ExtensionFunctionType (kotlin)"/>
+  <node text="Metadata (kotlin)"/>
+  <node text="DslMarker (kotlin)"/>
+  <node text="UnsafeVariance (kotlin)"/>
+  <node text="ReplaceWith (kotlin)"/>
+  <node text="Suppress (kotlin)"/>
+  <node text="Deprecated (kotlin)"/>
+  <node text="SinceKotlin (kotlin)"/>
+  <node text="ParameterName (kotlin)"/>
+  <node text="PublishedApi (kotlin)"/>
   <node text="MyAnno (a)"/>
   <node text="MyAnno2 (a)"/>
-  <node text="Nls (org.jetbrains.annotations)"/>
-  <node text="NoInfer (kotlin.internal)"/>
-  <node text="NonNls (org.jetbrains.annotations)"/>
-  <node text="NotNull (org.jetbrains.annotations)"/>
-  <node text="NotNull (org.jetbrains.annotations)"/>
-  <node text="Nullable (org.jetbrains.annotations)"/>
-  <node text="Nullable (org.jetbrains.annotations)"/>
-  <node text="OnlyInputTypes (kotlin.internal)"/>
-  <node text="Override (java.lang)"/>
-  <node text="ParameterName (kotlin)"/>
-  <node text="Pattern (org.intellij.lang.annotations)"/>
-  <node text="PlatformDependent (kotlin.internal)"/>
-  <node text="PrintFormat (org.intellij.lang.annotations)"/>
-  <node text="PropertyKey (org.jetbrains.annotations)"/>
-  <node text="PublishedApi (kotlin)"/>
-  <node text="PureReifiable (kotlin.internal)"/>
-  <node text="PurelyImplements (kotlin.jvm)"/>
-  <node text="ReadOnly (org.jetbrains.annotations)"/>
-  <node text="RegExp (org.intellij.lang.annotations)"/>
-  <node text="Repeatable (kotlin.annotation)"/>
-  <node text="ReplaceWith (kotlin)"/>
-  <node text="Retention (java.lang.annotation)"/>
-  <node text="Retention (kotlin.annotation)"/>
-  <node text="SinceKotlin (kotlin)"/>
-  <node text="Strictfp (kotlin.jvm)"/>
-  <node text="Subst (org.intellij.lang.annotations)"/>
-  <node text="Suppress (kotlin)"/>
-  <node text="SuppressWarnings (java.lang)"/>
-  <node text="Synchronized (kotlin.jvm)"/>
-  <node text="Target (java.lang.annotation)"/>
-  <node text="Target (kotlin.annotation)"/>
-  <node text="TestOnly (org.jetbrains.annotations)"/>
-  <node text="Throws (kotlin.jvm)"/>
-  <node text="Transient (kotlin.jvm)"/>
-  <node text="UnsafeVariance (kotlin)"/>
-  <node text="Volatile (kotlin.jvm)"/>
 </node>