diff --git a/idea/testData/fir/multiModule/basic/m1_java/base.txt b/idea/testData/fir/multiModule/basic/m1_java/base.txt
index 94415be0825..897907b1da6 100644
--- a/idea/testData/fir/multiModule/basic/m1_java/base.txt
+++ b/idea/testData/fir/multiModule/basic/m1_java/base.txt
@@ -2,14 +2,14 @@ FILE: base.kt
     public final class Hello {
         public constructor(msg: R|kotlin/String|): super<R|kotlin/Any|>()
 
-        public final property msg(val): R|kotlin/String|
+        public final val msg: R|kotlin/String|
             public get(): R|kotlin/String|
 
     }
     public final class Test {
         public constructor(set: R|java/util/Set<*>|): super<R|kotlin/Any|>()
 
-        public final property set(val): R|java/util/Set<*>|
+        public final val set: R|java/util/Set<*>|
             public get(): R|java/util/Set<*>|
 
     }
diff --git a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt
index b82ccd6ee7a..f2029ad2d37 100644
--- a/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt
+++ b/idea/testData/fir/multiModule/basic/m2_java_dep(m1-java)/user.txt
@@ -1,4 +1,4 @@
 FILE: user.kt
-    public final function foo(hello: R|hello/Hello|): R|kotlin/String| {
-        return@@@foo <Unresolved name: hello>#.<Unresolved name: msg>#
+    public final fun foo(hello: R|hello/Hello|): R|kotlin/String| {
+        ^foo R|<local>/hello|.R|hello/Hello.msg|
     }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
index a2796d44d6f..71652710768 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
@@ -1,4 +1,4 @@
 public open class Annotated : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
 
 }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
index 17add33dc44..e3d12596ebc 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/jvm/jvm.txt
@@ -2,9 +2,9 @@ FILE: jvm.kt
     public final class User : R|Annotated| {
         public constructor(): super<R|Annotated|>()
 
-        public final function test(): R|kotlin/Unit| {
-            val x: R|error: Not supported: FirImplicitTypeRefImpl| = R|/Annotated.foo|(String(123))
-            val y: R|error: Not supported: FirImplicitTypeRefImpl| = R|/Annotated.foo|(Null(null))
+        public final fun test(): R|kotlin/Unit| {
+            lval x: R|kotlin/String| = R|/Annotated.foo|(String(123))
+            lval y: R|kotlin/String| = R|/Annotated.foo|(Null(null))
         }
 
     }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
index 3529215de85..d9a68e536a2 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
@@ -1,8 +1,8 @@
 public open class Annotated : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator function foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
 
 }
 public open class AnnotatedDerived : R|Annotated| {
-    public open operator function foo(param: R|kotlin/String|?): R|kotlin/String|
+    public open operator fun foo(param: R|kotlin/String|?): R|kotlin/String|
 
 }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
index bf2265ae864..457bc54cadd 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/jvm/jvm.txt
@@ -2,9 +2,9 @@ FILE: jvm.kt
     public final class User : R|AnnotatedDerived| {
         public constructor(): super<R|AnnotatedDerived|>()
 
-        public final function test(): R|kotlin/Unit| {
-            val x: R|error: Not supported: FirImplicitTypeRefImpl| = R|/AnnotatedDerived.foo|(String(123))
-            val y: R|error: Not supported: FirImplicitTypeRefImpl| = R|/AnnotatedDerived.foo|(Null(null))
+        public final fun test(): R|kotlin/Unit| {
+            lval x: R|kotlin/String| = R|/AnnotatedDerived.foo|(String(123))
+            lval y: R|kotlin/String| = R|/AnnotatedDerived.foo|(Null(null))
         }
 
     }
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
index 90c084aac81..f428cfc999c 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
@@ -1,4 +1,4 @@
 <T> public open class A : R|java/lang/Object| {
-    public open operator function foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public open operator fun foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
 
 }
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
index d8d94406590..65ecba5ccc7 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
@@ -6,8 +6,8 @@ FILE: simpleFakeOverride.kt
     public final class B : R|A<Some>| {
         public constructor(): super<R|A<Some>|>()
 
-        public final function test(): R|kotlin/Unit| {
-            R|FakeOverride</A.foo: R|ft<T, T?>|!>|(<Unresolved name: Some>#())
+        public final fun test(): R|kotlin/Unit| {
+            R|FakeOverride</A.foo: R|ft<T, T?>|!>|(R|/Some.Some|())
         }
 
     }
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
index 762da8c5aff..1531328cfe2 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
@@ -1,6 +1,6 @@
 public open class Some : R|java/lang/Object| {
-    public open operator function foo(param: R|kotlin/Int|): R|kotlin/Boolean|
+    public open operator fun foo(param: R|kotlin/Int|): R|kotlin/Boolean|
 
-    public open operator function bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
+    public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
 
 }
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
index ad2a5b08ab2..c1d6e38dd1e 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
@@ -2,10 +2,10 @@ FILE: jvm.kt
     public final class A : R|Some| {
         public constructor(): super<R|Some|>()
 
-        public final function test(): R|kotlin/Unit| {
-            val res1: R|error: Not supported: FirImplicitTypeRefImpl| = R|/Some.foo|(Int(1))
-            val res2: R|error: Not supported: FirImplicitTypeRefImpl| = R|/Some.foo|(<Unresolved name: unaryMinus>#(Int(1)))
-            val res3: R|error: Not supported: FirImplicitTypeRefImpl| = R|/Some.bar|(<Unresolved name: intArrayOf>#(Int(0), Int(2), <Unresolved name: unaryMinus>#(Int(2))))
+        public final fun test(): R|kotlin/Unit| {
+            lval res1: R|kotlin/Boolean| = R|/Some.foo|(Int(1))
+            lval res2: R|kotlin/Boolean| = R|/Some.foo|(<Unresolved name: unaryMinus>#(Int(1)))
+            lval res3: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>| = R|/Some.bar|(<Unresolved name: intArrayOf>#(Int(0), Int(2), <Unresolved name: unaryMinus>#(Int(2))))
         }
 
     }
diff --git a/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/jvm/test.txt b/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/jvm/test.txt
index 4734c72aa71..42f768c2af1 100644
--- a/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/jvm/test.txt
+++ b/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/jvm/test.txt
@@ -1,8 +1,8 @@
 FILE: test.kt
     public abstract interface UseIterable : R|MyIterable<kotlin/String>| {
-        public open function test(): R|kotlin/Unit| {
-            val it: R|error: Not supported: FirImplicitTypeRefImpl| = R|FakeOverride<java/lang/Iterable.iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!>|()
-            val split: R|error: Not supported: FirImplicitTypeRefImpl| = R|FakeOverride<java/lang/Iterable.spliterator: R|ft<java/util/Spliterator<ft<T, T>>, java/util/Spliterator<ft<T, T>>>|>|()
+        public open fun test(): R|kotlin/Unit| {
+            lval it: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|! = R|FakeOverride<java/lang/Iterable.iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!>|()
+            lval split: R|ft<java/util/Spliterator<ft<T, T>>, java/util/Spliterator<ft<T, T>>>| = R|FakeOverride<java/lang/Iterable.spliterator: R|ft<java/util/Spliterator<ft<T, T>>, java/util/Spliterator<ft<T, T>>>|>|()
         }
 
     }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
index df4d706f7b4..35b1fe31816 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
@@ -1,4 +1,4 @@
 public open class Inheritor : R|Second| {
-    public open operator function foo R|First|.(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun R|First|.foo(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit|
 
 }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
index bf3b9c23721..36c3b9e3f95 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Base.txt
@@ -4,7 +4,7 @@ FILE: Base.kt
     public open class Second {
         public constructor(): super<R|kotlin/Any|>()
 
-        public open function foo R|First|.(s: R|kotlin/String|, i: R|kotlin/Int|): R|kotlin/Unit| {
+        public open fun R|First|.foo(s: R|kotlin/String|, i: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
index c845dac9c39..a029dbd3e55 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/jvm/Test.txt
@@ -2,7 +2,7 @@ FILE: Test.kt
     public final class Tester : R|Inheritor|, R|First| {
         public constructor(): super<R|Inheritor|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/Inheritor.foo|(String(abc), Int(456))
         }
 
diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
index f9919e546be..64f0851c40e 100644
--- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
@@ -1,4 +1,4 @@
 public open class Some : R|java/lang/Object|, R|Strange<*>| {
-    public open operator function foo(): R|kotlin/Any|
+    public open operator fun foo(): R|kotlin/Any|
 
 }
diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt
index c14eb7f9567..0f4bf3dfedf 100644
--- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt
+++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt
@@ -1,5 +1,5 @@
 FILE: Strange.kt
     <out T> public abstract interface Strange {
-        public abstract function foo(): R|T|
+        public abstract fun foo(): R|T|
 
     }
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
index 5389d453191..cc8346375ef 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
@@ -2,7 +2,7 @@ FILE: common.kt
     <T> public open expect class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public open function foo(arg: R|T|): R|kotlin/Unit|
+        public open fun foo(arg: R|T|): R|kotlin/Unit|
 
     }
     public open class B : R|A<kotlin/String>| {
@@ -12,12 +12,12 @@ FILE: common.kt
     public open class C : R|B| {
         public constructor(): super<R|B|>()
 
-        public open function bar(arg: R|kotlin/String|): R|kotlin/String| {
-            return@@@bar <Unresolved name: arg>#
+        public open fun bar(arg: R|kotlin/String|): R|kotlin/String| {
+            ^bar R|<local>/arg|
         }
 
-        public open function baz(arg: R|kotlin/CharSequence|): R|kotlin/String| {
-            return@@@baz <Unresolved name: arg>#.<Unresolved name: toString>#()
+        public open fun baz(arg: R|kotlin/CharSequence|): R|kotlin/String| {
+            ^baz R|<local>/arg|.<Unresolved name: toString>#()
         }
 
     }
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
index c257c9e5905..03c3f54eec3 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
@@ -2,22 +2,22 @@ FILE: jvm.kt
     <T> public open actual class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public open actual function foo(arg: R|T|): R|kotlin/Unit| {
+        public open actual fun foo(arg: R|T|): R|kotlin/Unit| {
         }
 
-        public open function bar(arg: R|T|): R|T| {
-            return@@@bar <Unresolved name: arg>#
+        public open fun bar(arg: R|T|): R|T| {
+            ^bar R|<local>/arg|
         }
 
-        public open function baz(arg: R|T|): R|T| {
-            return@@@baz <Unresolved name: arg>#
+        public open fun baz(arg: R|T|): R|T| {
+            ^baz R|<local>/arg|
         }
 
     }
     public final class D : R|C| {
         public constructor(): super<R|C|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|FakeOverride</A.foo: R|kotlin/Unit|>|(String())
             R|/C.bar|(String())
             <Ambiguity: baz, [/C.baz, /A.baz]>#(String())
diff --git a/idea/testData/fir/multiModule/mppMemberType/common/common.txt b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
index b34bfbd9e81..2432c17d6d9 100644
--- a/idea/testData/fir/multiModule/mppMemberType/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/common/common.txt
@@ -2,13 +2,13 @@ FILE: common.kt
     public final expect class MyList {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function get(i: R|kotlin/Int|): R|kotlin/Int|
+        public final fun get(i: R|kotlin/Int|): R|kotlin/Int|
 
     }
     public open class Wrapper {
         public constructor(list: R|MyList|): super<R|kotlin/Any|>()
 
-        public final property list(val): R|MyList|
+        public final val list: R|MyList|
             public get(): R|MyList|
 
     }
diff --git a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
index 3f5acf439d8..5a861ccdb2f 100644
--- a/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMemberType/jvm/jvm.txt
@@ -2,33 +2,33 @@ FILE: jvm.kt
     public final actual class MyList {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final actual function get(i: R|kotlin/Int|): R|kotlin/Int| {
-            return@@@get <Unresolved name: i>#
+        public final actual fun get(i: R|kotlin/Int|): R|kotlin/Int| {
+            ^get R|<local>/i|
         }
 
-        public final function set(i: R|kotlin/Int|, v: R|kotlin/Int|): R|kotlin/Unit| {
+        public final fun set(i: R|kotlin/Int|, v: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
     public final class DerivedList : R|MyList| {
         public constructor(): super<R|MyList|>()
 
-        public final function useMember(): R|kotlin/Unit| {
+        public final fun useMember(): R|kotlin/Unit| {
             R|/MyList.get|(Int(1))
             R|/MyList.set|(Int(2), Int(3))
         }
 
     }
-    public final function useList(list: R|MyList|): R|kotlin/Unit| {
-        <Unresolved name: list>#.<Unresolved name: get>#(Int(1))
-        <Unresolved name: list>#.<Unresolved name: set>#(Int(2), Int(3))
+    public final fun useList(list: R|MyList|): R|kotlin/Unit| {
+        R|<local>/list|.R|/MyList.get|(Int(1))
+        R|<local>/list|.R|/MyList.set|(Int(2), Int(3))
     }
     public final class DerivedWrapper : R|Wrapper| {
         public constructor(): super<R|Wrapper|>()
 
-        public final function use(): R|kotlin/Unit| {
-            R|/Wrapper.list|.<Unresolved name: get>#(Int(1))
-            R|/Wrapper.list|.<Unresolved name: set>#(Int(2), Int(3))
+        public final fun use(): R|kotlin/Unit| {
+            R|/Wrapper.list|.R|/MyList.get|(Int(1))
+            R|/Wrapper.list|.R|/MyList.set|(Int(2), Int(3))
         }
 
     }
diff --git a/idea/testData/fir/multiModule/mppMembers/common/common.txt b/idea/testData/fir/multiModule/mppMembers/common/common.txt
index 5012d250b47..9cd8ccad72f 100644
--- a/idea/testData/fir/multiModule/mppMembers/common/common.txt
+++ b/idea/testData/fir/multiModule/mppMembers/common/common.txt
@@ -2,7 +2,7 @@ FILE: common.kt
     public open expect class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function foo(): R|kotlin/Unit|
+        public final fun foo(): R|kotlin/Unit|
 
     }
     public open class B : R|A| {
diff --git a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
index 4dc1e2ef687..6c7d9c853ce 100644
--- a/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppMembers/jvm/jvm.txt
@@ -2,17 +2,17 @@ FILE: jvm.kt
     public open actual class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final actual function foo(): R|kotlin/Unit| {
+        public final actual fun foo(): R|kotlin/Unit| {
         }
 
-        public final function bar(): R|kotlin/Unit| {
+        public final fun bar(): R|kotlin/Unit| {
         }
 
     }
     public final class C : R|B| {
         public constructor(): super<R|B|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/A.bar|()
         }
@@ -21,7 +21,7 @@ FILE: jvm.kt
     public final class D : R|A| {
         public constructor(): super<R|A|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/A.bar|()
         }
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
index 5012d250b47..9cd8ccad72f 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/common/common.txt
@@ -2,7 +2,7 @@ FILE: common.kt
     public open expect class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function foo(): R|kotlin/Unit|
+        public final fun foo(): R|kotlin/Unit|
 
     }
     public open class B : R|A| {
diff --git a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
index d2775ee3c15..9555c01a372 100644
--- a/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppSuperTypes/jvm/jvm.txt
@@ -2,26 +2,26 @@ FILE: jvm.kt
     public abstract class X {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function bar(): R|kotlin/Unit| {
+        public final fun bar(): R|kotlin/Unit| {
         }
 
     }
     public abstract interface Y {
-        public open function baz(): R|kotlin/Unit| {
+        public open fun baz(): R|kotlin/Unit| {
         }
 
     }
     public open actual class A : R|X|, R|Y| {
         public constructor(): super<R|X|>()
 
-        public final actual function foo(): R|kotlin/Unit| {
+        public final actual fun foo(): R|kotlin/Unit| {
         }
 
     }
     public final class C : R|B| {
         public constructor(): super<R|B|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/X.bar|()
             R|/Y.baz|()
@@ -31,7 +31,7 @@ FILE: jvm.kt
     public final class D : R|A| {
         public constructor(): super<R|A|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/X.bar|()
             R|/Y.baz|()
diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
index cfd6fccdb7a..4f229b1ef63 100644
--- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
@@ -1,6 +1,6 @@
 public open class A : R|java/lang/Object| {
-    public open operator function foo(): R|ft<A, A?>|!
+    public open operator fun foo(): R|ft<A, A?>|!
 
-    public open operator function bar(): R|ft<A, A?>|!
+    public open operator fun bar(): R|ft<A, A?>|!
 
 }
diff --git a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
index ec5ad410d76..8a60a1f2617 100644
--- a/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
+++ b/idea/testData/fir/multiModule/overrideWithJava/jvm/B.txt
@@ -2,15 +2,15 @@ FILE: B.kt
     public final class B : R|A| {
         public constructor(): super<R|A|>()
 
-        public final override function foo(): R|B| {
-            return@@@foo this#
+        public final override fun foo(): R|B| {
+            ^foo this#
         }
 
-        public final function bar(): R|B| {
-            return@@@bar this#
+        public final fun bar(): R|B| {
+            ^bar this#
         }
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/B.foo|()
             R|/B.bar|()
         }