diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/Fir2IrCallableDeclarationsGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/Fir2IrCallableDeclarationsGenerator.kt
index 3eff0bad429..a312ba13469 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/Fir2IrCallableDeclarationsGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/Fir2IrCallableDeclarationsGenerator.kt
@@ -977,48 +977,51 @@ class Fir2IrCallableDeclarationsGenerator(val components: Fir2IrComponents) : Fi
 
     // ------------------------------------ utilities ------------------------------------
 
-    /**
-     * [firCallable] is function or property (if [irFunction] is a property accessor) for
-     *   which [irFunction] was build
-     *
-     * It is needed to determine proper dispatch receiver type if this declaration is fake-override
-     */
-    private fun computeDispatchReceiverType(
-        irFunction: IrSimpleFunction,
-        firCallable: FirCallableDeclaration?,
-        parent: IrDeclarationParent?,
-    ): IrType? {
-        /*
-         * If some function is not fake-override, then its type should be just
-         *   default type of containing class
-         * For fake overrides the default type calculated in the following way:
-         * 1. Find first overridden function, which is not fake override
-         * 2. Take its containing class
-         * 3. Find supertype of current containing class with type constructor of
-          *   class from step 2
+    companion object {
+        /**
+         * [firCallable] is function or property (if [irFunction] is a property accessor) for
+         *   which [irFunction] was build
+         *
+         * It is needed to determine proper dispatch receiver type if this declaration is fake-override
          */
-        if (firCallable is FirProperty && firCallable.isLocal) return null
-        val containingClass = computeContainingClass(parent) ?: return null
-        val defaultType = containingClass.defaultType
-        if (firCallable == null) return defaultType
-        if (irFunction.origin != IrDeclarationOrigin.FAKE_OVERRIDE) return defaultType
+        context(Fir2IrComponents)
+        internal fun computeDispatchReceiverType(
+            irFunction: IrSimpleFunction,
+            firCallable: FirCallableDeclaration?,
+            parent: IrDeclarationParent?,
+        ): IrType? {
+            /*
+             * If some function is not fake-override, then its type should be just
+             *   default type of containing class
+             * For fake overrides the default type calculated in the following way:
+             * 1. Find first overridden function, which is not fake override
+             * 2. Take its containing class
+             * 3. Find supertype of current containing class with type constructor of
+             *    class from step 2
+             */
+            if (firCallable is FirProperty && firCallable.isLocal) return null
+            val containingClass = computeContainingClass(parent) ?: return null
+            val defaultType = containingClass.defaultType
+            if (firCallable == null) return defaultType
+            if (!irFunction.isFakeOverride) return defaultType
 
-        val originalCallable = firCallable.unwrapFakeOverrides()
-        val containerOfOriginalCallable = originalCallable.containingClassLookupTag() ?: return defaultType
-        val containerOfFakeOverride = firCallable.dispatchReceiverType ?: return defaultType
-        val correspondingSupertype = AbstractTypeChecker.findCorrespondingSupertypes(
-            session.typeContext.newTypeCheckerState(errorTypesEqualToAnything = false, stubTypesEqualToAnything = false),
-            containerOfFakeOverride,
-            containerOfOriginalCallable
-        ).firstOrNull() as ConeKotlinType? ?: return defaultType
-        return correspondingSupertype.toIrType()
-    }
+            val originalCallable = firCallable.unwrapFakeOverrides()
+            val containerOfOriginalCallable = originalCallable.containingClassLookupTag() ?: return defaultType
+            val containerOfFakeOverride = firCallable.dispatchReceiverType ?: return defaultType
+            val correspondingSupertype = AbstractTypeChecker.findCorrespondingSupertypes(
+                session.typeContext.newTypeCheckerState(errorTypesEqualToAnything = false, stubTypesEqualToAnything = false),
+                containerOfFakeOverride,
+                containerOfOriginalCallable
+            ).firstOrNull() as ConeKotlinType? ?: return defaultType
+            return correspondingSupertype.toIrType()
+        }
 
-    private fun computeContainingClass(parent: IrDeclarationParent?): IrClass? {
-        return if (parent is IrClass && parent !is Fir2IrDeclarationStorage.NonCachedSourceFileFacadeClass) {
-            parent
-        } else {
-            null
+        private fun computeContainingClass(parent: IrDeclarationParent?): IrClass? {
+            return if (parent is IrClass && parent !is Fir2IrDeclarationStorage.NonCachedSourceFileFacadeClass) {
+                parent
+            } else {
+                null
+            }
         }
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt
index c825cb40493..f63fe78013a 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazySimpleFunction.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.lazy
 
 import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
 import org.jetbrains.kotlin.fir.backend.contextReceiversForFunctionOrContainingProperty
+import org.jetbrains.kotlin.fir.backend.generators.Fir2IrCallableDeclarationsGenerator
 import org.jetbrains.kotlin.fir.backend.generators.generateOverriddenFunctionSymbols
 import org.jetbrains.kotlin.fir.backend.toIrType
 import org.jetbrains.kotlin.fir.declarations.FirFunction
@@ -52,7 +53,12 @@ class Fir2IrLazySimpleFunction(
     override var dispatchReceiverParameter: IrValueParameter? by lazyVar(lock) {
         val containingClass = parent as? IrClass
         if (containingClass != null && shouldHaveDispatchReceiver(containingClass)) {
-            createThisReceiverParameter(thisType = containingClass.thisReceiver?.type ?: error("No this receiver for containing class"))
+            val thisType = Fir2IrCallableDeclarationsGenerator.computeDispatchReceiverType(
+                this,
+                fir,
+                containingClass
+            )
+            createThisReceiverParameter(thisType ?: error("No dispatch receiver receiver for function"))
         } else null
     }
 
diff --git a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.kt b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.kt
index 15dc11f597a..4b8adc554f0 100644
--- a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.kt
+++ b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.kt
@@ -1,6 +1,5 @@
 // FIR_DUMP
 // DUMP_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 
 annotation class Ann(@Ann(1) val e: Int)
 
diff --git a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.kt b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.kt
index 94e8960ec78..e943e0d496e 100644
--- a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.kt
+++ b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.kt
@@ -1,7 +1,6 @@
 // WITH_STDLIB
 // WITH_REFLECT
 // TARGET_BACKEND: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // FIR_DUMP
 // DUMP_IR
 
diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
index fcc3efc1b0b..70f2d2fbbff 100644
--- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
+++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // DUMP_IR
 // FULL_JDK
 // WITH_REFLECT
diff --git a/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt
index e1e68a080ed..e73230d2f34 100644
--- a/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt
+++ b/compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 // IGNORE_BACKEND_K1: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // Field VS property: case 4.1
 // See KT-50082
 // DUMP_IR
diff --git a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.kt b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.kt
index 3f00b95cfcb..88da7c47c50 100644
--- a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.kt
+++ b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 // DUMP_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // FILE: javapackage/PackagePrivateGrandparentInterface.java
 
 package javapackage;
diff --git a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.kt b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.kt
index df1e33e411c..0832262b05d 100644
--- a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.kt
+++ b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.kt
@@ -1,6 +1,5 @@
 // ISSUE: KT-57655
 // !LANGUAGE: +ImplicitSignedToUnsignedIntegerConversion
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // ALLOW_KOTLIN_PACKAGE
 // WITH_STDLIB
 // DUMP_IR
diff --git a/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt b/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt
index 48b216bece1..e200e8f2b41 100644
--- a/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt
+++ b/compiler/testData/ir/irText/classes/kt45853.__AX.fir.ir.txt
@@ -11,23 +11,23 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:AX modality:ABSTRACT visibili
       overridden:
         public abstract fun <get-a> (): <root>.A? declared in <root>.A
       $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.AX
-  FUN FAKE_OVERRIDE name:getA visibility:public modality:ABSTRACT <> ($this:<root>.AX) returnType:@[FlexibleNullability] <root>.X? [fake_override]
+  FUN FAKE_OVERRIDE name:getA visibility:public modality:ABSTRACT <> ($this:<root>.X) returnType:@[FlexibleNullability] <root>.X? [fake_override]
     overridden:
       public abstract fun getA (): @[FlexibleNullability] <root>.X? declared in <root>.X
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.AX
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.AX, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.X
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.A
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.X
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.AX
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.AX) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.A
       public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.X
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.AX
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.AX) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String [fake_override] declared in <root>.A
       public open fun toString (): kotlin.String [fake_override] declared in <root>.X
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.AX
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/kt45853.__X.fir.ir.txt b/compiler/testData/ir/irText/classes/kt45853.__X.fir.ir.txt
index 08aac846074..cbc8b0df108 100644
--- a/compiler/testData/ir/irText/classes/kt45853.__X.fir.ir.txt
+++ b/compiler/testData/ir/irText/classes/kt45853.__X.fir.ir.txt
@@ -2,16 +2,16 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB INTERFACE name:X modality:ABSTRACT visib
   $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.X
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:getA visibility:public modality:ABSTRACT <> ($this:<root>.X) returnType:@[FlexibleNullability] <root>.X?
     $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.X
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.X, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.X
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.X) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.X
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.X) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.X
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.fir.ir.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.fir.ir.txt
index f95e52f45fb..56063b37e78 100644
--- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.__J1.fir.ir.txt
@@ -9,29 +9,29 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J1 modality:OPEN visibility:p
     CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <Y2> ($this:<root>.J1<X1 of <root>.J1>) returnType:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>
       TYPE_PARAMETER name:Y2 index:1 variance: superTypes:[@[FlexibleNullability] kotlin.CharSequence?] reified:false
       $outer: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J1<X1 of <root>.J1>
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<X2 of <root>.J1.J2, X1 of <root>.J1>
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J1<X1 of <root>.J1>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<X1 of <root>.J1>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J1<X1 of <root>.J1>) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<X1 of <root>.J1>
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J1<X1 of <root>.J1>) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<X1 of <root>.J1>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.Array.fir.ir.txt b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.Array.fir.ir.txt
index c1c661e229a..189a7b5559d 100644
--- a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.Array.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.Array.fir.ir.txt
@@ -22,22 +22,22 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Array modality:FINAL visibility:pu
     overridden:
       protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Array<T of kotlin.Array>
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Array<T of kotlin.Array>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Cloneable
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Array<T of kotlin.Array>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Array<T of kotlin.Array>) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
       public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Cloneable
       public open fun hashCode (): kotlin.Int [fake_override] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Array<T of kotlin.Array>
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Array<T of kotlin.Array>) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
       public open fun toString (): kotlin.String [fake_override] declared in kotlin.Cloneable
       public open fun toString (): kotlin.String [fake_override] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Array<T of kotlin.Array>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.IntArray.fir.ir.txt b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.IntArray.fir.ir.txt
index ce345f57218..bf71786ea40 100644
--- a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.IntArray.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.IntArray.fir.ir.txt
@@ -23,22 +23,22 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:IntArray modality:FINAL visibility
     overridden:
       protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.IntArray
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.IntArray, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.Cloneable
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.IntArray
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.IntArray) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
       public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Cloneable
       public open fun hashCode (): kotlin.Int [fake_override] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.IntArray
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.IntArray) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
       public open fun toString (): kotlin.String [fake_override] declared in kotlin.Cloneable
       public open fun toString (): kotlin.String [fake_override] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.IntArray
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.collections.IntIterator.fir.ir.txt b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.collections.IntIterator.fir.ir.txt
index 0ec7158b74d..356ab91ae25 100644
--- a/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.collections.IntIterator.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/arraysFromBuiltins.__kotlin.collections.IntIterator.fir.ir.txt
@@ -7,20 +7,20 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:IntIterator modality:ABSTRACT visi
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.IntIterator
   FUN IR_EXTERNAL_DECLARATION_STUB name:nextInt visibility:public modality:ABSTRACT <> ($this:kotlin.collections.IntIterator) returnType:kotlin.Int
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.collections.IntIterator
-  FUN FAKE_OVERRIDE name:hasNext visibility:public modality:ABSTRACT <> ($this:kotlin.collections.IntIterator) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:hasNext visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Iterator<kotlin.Int>) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public abstract fun hasNext (): kotlin.Boolean [operator] declared in kotlin.collections.Iterator
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.collections.IntIterator
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.collections.IntIterator, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.collections.Iterator<kotlin.Int>
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.collections.Iterator
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.collections.IntIterator
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.collections.IntIterator) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.collections.Iterator
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.collections.IntIterator
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.collections.IntIterator) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String [fake_override] declared in kotlin.collections.Iterator
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.collections.IntIterator
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt
index 4fcec384fc6..b7db9fc733f 100644
--- a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt
@@ -35,19 +35,19 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
       FUN IR_EXTERNAL_DECLARATION_STUB name:<get-SIZE_BYTES> visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:kotlin.Int
         correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES visibility:public modality:FINAL [const,val]
         $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int.Companion
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Int.Companion, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Int.Companion
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Int.Companion) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Int.Companion
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Int.Companion) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Int.Companion
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
   FUN IR_EXTERNAL_DECLARATION_STUB name:and visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int [infix]
     annotations:
       IntrinsicConstEvaluation
@@ -377,9 +377,9 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ
       IntrinsicConstEvaluation
     $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:<this> type:kotlin.Int
     VALUE_PARAMETER name:other index:0 type:kotlin.Int
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Int) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Number
       public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Comparable
       public open fun hashCode (): kotlin.Int [fake_override] declared in java.io.Serializable
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Int
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.fir.ir.txt
index dfc7c280721..5ee0884e304 100644
--- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.__J1.fir.ir.txt
@@ -14,29 +14,29 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J1 modality:OPEN visibility:p
       TYPE_PARAMETER name:X2 index:1 variance: superTypes:[@[FlexibleNullability] kotlin.Any?] reified:false
       $outer: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J1<T1 of <root>.J1>
       VALUE_PARAMETER name:x2 index:0 type:@[FlexibleNullability] X2 of <root>.J1.J2.<init>?
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1.J2<T2 of <root>.J1.J2, T1 of <root>.J1>
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J1<T1 of <root>.J1>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<T1 of <root>.J1>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J1<T1 of <root>.J1>) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<T1 of <root>.J1>
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J1<T1 of <root>.J1>) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J1<T1 of <root>.J1>
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
index fb414b7066e..70ce69add5a 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
@@ -9,28 +9,28 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB ENUM_CLASS name:JEnum modality:FINAL vis
   PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.JEnum>
       correspondingProperty: PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
-  FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:<root>.JEnum) returnType:kotlin.Any [fake_override]
+  FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>) returnType:kotlin.Any [fake_override]
     overridden:
       protected final fun clone (): kotlin.Any declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
-  FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:<root>.JEnum, other:@[FlexibleNullability] <root>.JEnum?) returnType:kotlin.Int [fake_override,operator]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
+  FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>, other:@[FlexibleNullability] <root>.JEnum?) returnType:kotlin.Int [fake_override,operator]
     overridden:
       public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
     VALUE_PARAMETER name:other index:0 type:@[FlexibleNullability] <root>.JEnum?
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:<root>.JEnum, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:<root>.JEnum) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>) returnType:kotlin.Int [fake_override]
     overridden:
       public final fun hashCode (): kotlin.Int declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.JEnum) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
   PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
     annotations:
       IntrinsicConstEvaluation
@@ -51,11 +51,11 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB ENUM_CLASS name:JEnum modality:FINAL vis
       overridden:
         public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
       $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
-  FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:<root>.JEnum) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.JEnum?>? [fake_override]
+  FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] <root>.JEnum?>? [fake_override]
     overridden:
       public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
-  FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:<root>.JEnum) returnType:kotlin.Unit [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
+  FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>) returnType:kotlin.Unit [fake_override]
     overridden:
       protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.JEnum
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Enum<@[FlexibleNullability] <root>.JEnum?>
diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.__J.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.__J.fir.ir.txt
index 4c309f30125..7daa7fe2aab 100644
--- a/compiler/testData/ir/irText/stubs/javaInnerClass.__J.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaInnerClass.__J.fir.ir.txt
@@ -7,31 +7,31 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J modality:OPEN visibility:pu
       $outer: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J
     FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:foo visibility:public modality:OPEN <> ($this:<root>.J.JInner) returnType:kotlin.Unit
       $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J.JInner
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J.JInner, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J.JInner) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JInner
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J.JInner) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Unit
     $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaMethod.__J.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaMethod.__J.fir.ir.txt
index 642126609c7..e529e99e34e 100644
--- a/compiler/testData/ir/irText/stubs/javaMethod.__J.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaMethod.__J.fir.ir.txt
@@ -3,16 +3,16 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J modality:OPEN visibility:pu
   CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> () returnType:<root>.J [primary]
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Unit
     $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.__J.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaNestedClass.__J.fir.ir.txt
index 10f794f8513..4399e8c8566 100644
--- a/compiler/testData/ir/irText/stubs/javaNestedClass.__J.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaNestedClass.__J.fir.ir.txt
@@ -7,29 +7,29 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J modality:OPEN visibility:pu
     FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:foo visibility:public modality:OPEN <> ($this:<root>.J.JJ) returnType:kotlin.Unit
       $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J.JJ
     FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:bar visibility:public modality:OPEN <> () returnType:kotlin.Unit
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J.JJ, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JJ
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J.JJ) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JJ
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J.JJ) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J.JJ
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Base.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Base.fir.ir.txt
index 4d34407f001..2075ee0103c 100644
--- a/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Base.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Base.fir.ir.txt
@@ -5,45 +5,45 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:Base modality:OPEN visibility
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base.BaseInner
     CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> ($this:<root>.Base) returnType:<root>.Base.BaseInner [primary]
       $outer: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.Base
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Base.BaseInner, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Base.BaseInner) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseInner
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Base.BaseInner) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
   CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:BaseNested modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base.BaseNested
     CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> () returnType:<root>.Base.BaseNested [primary]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Base.BaseNested, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseNested
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Base.BaseNested) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseNested
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Base.BaseNested) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base.BaseNested
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Base, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Base) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Base
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Derived.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Derived.fir.ir.txt
index 2cb2a386846..1f859eb4641 100644
--- a/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Derived.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaNestedClassesInHierarchy.__Derived.fir.ir.txt
@@ -5,45 +5,45 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:Derived modality:OPEN visibil
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived.DerivedInner
     CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> ($this:<root>.Derived) returnType:<root>.Derived.DerivedInner [primary]
       $outer: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.Derived
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedInner, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base.BaseInner
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedInner) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base.BaseInner
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedInner
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedInner) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String [fake_override] declared in <root>.Base.BaseInner
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedInner
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
   CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:DerivedNested modality:OPEN visibility:public superTypes:[<root>.Base.BaseNested]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived.DerivedNested
     CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> () returnType:<root>.Derived.DerivedNested [primary]
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedNested, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base.BaseNested
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedNested
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedNested) returnType:kotlin.Int [fake_override]
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base.BaseNested
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedNested
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Derived.DerivedNested) returnType:kotlin.String [fake_override]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
         public open fun toString (): kotlin.String [fake_override] declared in <root>.Base.BaseNested
-      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived.DerivedNested
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.Derived, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Base
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.Derived) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Base
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.Derived) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String [fake_override] declared in <root>.Base
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.Derived
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.fir.ir.txt
index 394b4d8e70a..be1b25f8bb2 100644
--- a/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaStaticMethod.__J.fir.ir.txt
@@ -2,16 +2,16 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J modality:OPEN visibility:pu
   $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.J
   CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public <> () returnType:<root>.J [primary]
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:bar visibility:public modality:OPEN <> () returnType:kotlin.Unit
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.fir.ir.txt
index 092b7f49ed9..eb484b39c9c 100644
--- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.__J.fir.ir.txt
@@ -3,16 +3,16 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB CLASS name:J modality:OPEN visibility:pu
   CONSTRUCTOR IR_EXTERNAL_JAVA_DECLARATION_STUB visibility:public/*package*/ <> () returnType:<root>.J [primary]
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:getFoo visibility:public modality:OPEN <> ($this:<root>.J) returnType:@[FlexibleNullability] kotlin.String?
     $this: VALUE_PARAMETER IR_EXTERNAL_JAVA_DECLARATION_STUB name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<root>.J, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
     overridden:
       public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
     VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.Int [fake_override]
+  FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
     overridden:
       public open fun hashCode (): kotlin.Int declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
-  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<root>.J) returnType:kotlin.String [fake_override]
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any
+  FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
     overridden:
       public open fun toString (): kotlin.String declared in kotlin.Any
-    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:<root>.J
+    $this: VALUE_PARAMETER FAKE_OVERRIDE name:<this> type:kotlin.Any