diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
index 9e37cd707a6..a08bbb7ab42 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt
@@ -1,10 +1,10 @@
 FILE: complexTypes.kt
-    <T, out S> public? final? class C : kotlin/Any {
+    public? final? class C<T, out S> : kotlin/Any {
         public? constructor<T, out S>(): R|a/b/C<T, S>| {
             super<kotlin/Any>()
         }
 
-        <R, in P> public? final? inner class D : kotlin/Any {
+        public? final? inner class D<R, in P> : kotlin/Any {
             public? constructor<R, in P>(): R|a/b/C.D<R, P>| {
                 super<kotlin/Any>()
             }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
index 37d5b17fdc5..0bc36e1adfd 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt
@@ -1,5 +1,5 @@
 FILE: derivedClass.kt
-    <T> public? open class Base : kotlin/Any {
+    public? open class Base<T> : kotlin/Any {
         public? constructor<T>(x: T): R|Base<T>| {
             super<kotlin/Any>()
         }
@@ -8,12 +8,12 @@ FILE: derivedClass.kt
             public? get(): T
 
     }
-    <T : Any> public? final? class Derived : Base<T> {
+    public? final? class Derived<T : Any> : Base<T> {
         public? constructor<T : Any>(x: T): R|Derived<T>| {
             super<Base<T>>(x#)
         }
 
     }
-    <T : Any> public? final? fun create(x: T): Derived<T> {
+    public? final? fun <T : Any> create(x: T): Derived<T> {
         ^create Derived#(x#)
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt
index e8c0328ffb6..b52fe95b978 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt
@@ -1,9 +1,9 @@
 FILE: functionTypes.kt
-    <T> public? final? fun simpleRun(f: ( (T) -> Unit )): Unit {
+    public? final? fun <T> simpleRun(f: ( (T) -> Unit )): Unit {
         ^simpleRun f#()
     }
-    <T, R> public? final? fun List<T>.simpleMap(f: ( (T) -> R )): R {
+    public? final? fun <T, R> List<T>.simpleMap(f: ( (T) -> R )): R {
     }
-    <T> public? final? fun simpleWith(t: T, f: ( T.() -> Unit )): Unit {
+    public? final? fun <T> simpleWith(t: T, f: ( T.() -> Unit )): Unit {
         ^simpleWith t#.f#()
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
index e70751b1e34..93876005dea 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt
@@ -1,7 +1,7 @@
 FILE: genericFunctions.kt
     public? final? interface Any : kotlin/Any {
     }
-    <reified T : Any> public? final? inline fun Any.safeAs(): T? {
+    public? final? inline fun <reified T : Any> Any.safeAs(): T? {
         ^safeAs (this# as? T)
     }
     public? abstract class Summator : kotlin/Any {
@@ -9,6 +9,6 @@ FILE: genericFunctions.kt
             super<kotlin/Any>()
         }
 
-        <T> public? abstract fun plus(first: T, second: T): T
+        public? abstract fun <T> plus(first: T, second: T): T
 
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.kt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.kt
new file mode 100644
index 00000000000..79e406eb4d0
--- /dev/null
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.kt
@@ -0,0 +1,3 @@
+fun <T> genericFoo(): T = TODO()
+
+val <T> T.generic: T get() = genericFoo()
\ No newline at end of file
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.txt
new file mode 100644
index 00000000000..eb8919f8f7d
--- /dev/null
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.txt
@@ -0,0 +1,8 @@
+FILE: genericProperty.kt
+    public? final? fun <T> genericFoo(): T {
+        ^genericFoo TODO#()
+    }
+    public? final? val <T> T.generic: T
+        public? get(): T {
+            ^ genericFoo#()
+        }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
index 39417531481..97718fc93d2 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeAliasWithGeneric.txt
@@ -5,9 +5,9 @@ FILE: typeAliasWithGeneric.kt
         }
 
     }
-    <S, T : A> public? final? interface B : kotlin/Any {
+    public? final? interface B<S, T : A> : kotlin/Any {
     }
-    <T> public? final typealias C = B<T, A>
+    public? final typealias C<T> = B<T, A>
     public? final? class D : C<A> {
         public? constructor(): R|D| {
             super<kotlin/Any>()
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
index 3e0a4849905..0eb2186ef52 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt
@@ -1,7 +1,7 @@
 FILE: typeParameterVsNested.kt
     public? final? interface Some : kotlin/Any {
     }
-    <T : Some> public? abstract class My : kotlin/Any {
+    public? abstract class My<T : Some> : kotlin/Any {
         public? constructor<T : Some>(): R|test/My<T>| {
             super<kotlin/Any>()
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
index 65ca9ca5737..442d29b5efd 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt
@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    <out T : Any> public? final? interface List : kotlin/Any {
+    public? final? interface List<out T : Any> : kotlin/Any {
         public? final? operator fun get(index: Int): T
 
         public? final? infix fun concat(other: List<T>): List<T>
@@ -7,7 +7,7 @@ FILE: typeParameters.kt
     }
     public? final typealias StringList = List<out String>
     public? final typealias AnyList = List<*>
-    <out T : Any> public? abstract class AbstractList : List<T> {
+    public? abstract class AbstractList<out T : Any> : List<T> {
         public? constructor<out T : Any>(): R|AbstractList<T>| {
             super<kotlin/Any>()
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
index e26f3c1734b..18ca68bda3f 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/where.txt
@@ -3,7 +3,7 @@ FILE: where.kt
     }
     public? final? interface B : kotlin/Any {
     }
-    <T : A, B> public? final? class C : kotlin/Any {
+    public? final? class C<T : A, B> : kotlin/Any {
         public? constructor<T : A, B>(): R|C<T>| {
             super<kotlin/Any>()
         }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
index 1d3f72fe9fb..4e485f4ecdd 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt
@@ -1,5 +1,5 @@
 FILE: genericCalls.kt
-    <T> public? final? fun nullableValue(): T? {
+    public? final? fun <T> nullableValue(): T? {
         ^nullableValue Null(null)
     }
     public? final? fun test(): kotlin/Unit {
diff --git a/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java
index cf55127bfcf..9c92a89ce5e 100644
--- a/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java
+++ b/compiler/fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTestCaseGenerated.java
@@ -81,6 +81,11 @@ public class RawFirBuilderTestCaseGenerated extends AbstractRawFirBuilderTestCas
             runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.kt");
         }
 
+        @TestMetadata("genericProperty.kt")
+        public void testGenericProperty() throws Exception {
+            runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/genericProperty.kt");
+        }
+
         @TestMetadata("nestedClass.kt")
         public void testNestedClass() throws Exception {
             runTest("compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.kt");
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
index 8aea98c385e..0f7a1e4f04b 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
@@ -25,7 +25,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
 
 }
 
-<E> public abstract interface Collection : R|kotlin/collections/Iterable<E>| {
+public abstract interface Collection<E> : R|kotlin/collections/Iterable<E>| {
     public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -63,19 +63,19 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
 }
 
-<T> public abstract interface Iterable : R|kotlin/Any| {
+public abstract interface Iterable<T> : R|kotlin/Any| {
     public abstract operator fun iterator(): R|kotlin/collections/Iterator<T>|
 
 }
 
-<T> public abstract interface Iterator : R|kotlin/Any| {
+public abstract interface Iterator<T> : R|kotlin/Any| {
     public abstract operator fun hasNext(): R|kotlin/Boolean|
 
     public abstract operator fun next(): R|T|
 
 }
 
-<E> public abstract interface List : R|kotlin/collections/Collection<E>| {
+public abstract interface List<E> : R|kotlin/collections/Collection<E>| {
     public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -98,7 +98,7 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
 }
 
-<T> public abstract interface ListIterator : R|kotlin/collections/Iterator<T>| {
+public abstract interface ListIterator<T> : R|kotlin/collections/Iterator<T>| {
     public abstract operator fun hasNext(): R|kotlin/Boolean|
 
     public abstract fun hasPrevious(): R|kotlin/Boolean|
@@ -122,7 +122,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
 }
 
-<K, V> public abstract interface Map : R|kotlin/Any| {
+public abstract interface Map<K, V> : R|kotlin/Any| {
     public abstract fun containsKey(key: R|K|): R|kotlin/Boolean|
 
     public abstract fun containsValue(value: R|V|): R|kotlin/Boolean|
@@ -133,12 +133,12 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public abstract fun isEmpty(): R|kotlin/Boolean|
 
-    <K, V> public abstract interface Entry : R|kotlin/Any| {
+    public abstract interface Entry<K, V> : R|kotlin/Any| {
     }
 
 }
 
-<E> public abstract interface MutableCollection : R|kotlin/collections/Collection<E>|, R|kotlin/collections/MutableIterable<E>| {
+public abstract interface MutableCollection<E> : R|kotlin/collections/Collection<E>|, R|kotlin/collections/MutableIterable<E>| {
     public abstract fun add(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun addAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -155,17 +155,17 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
 }
 
-<T> public abstract interface MutableIterable : R|kotlin/collections/Iterable<T>| {
+public abstract interface MutableIterable<T> : R|kotlin/collections/Iterable<T>| {
     public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<T>|
 
 }
 
-<T> public abstract interface MutableIterator : R|kotlin/collections/Iterator<T>| {
+public abstract interface MutableIterator<T> : R|kotlin/collections/Iterator<T>| {
     public abstract fun remove(): R|kotlin/Unit|
 
 }
 
-<E> public abstract interface MutableList : R|kotlin/collections/List<E>|, R|kotlin/collections/MutableCollection<E>| {
+public abstract interface MutableList<E> : R|kotlin/collections/List<E>|, R|kotlin/collections/MutableCollection<E>| {
     public abstract fun add(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun add(index: R|kotlin/Int|, element: R|E|): R|kotlin/Unit|
@@ -194,7 +194,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
 }
 
-<T> public abstract interface MutableListIterator : R|kotlin/collections/ListIterator<T>|, R|kotlin/collections/MutableIterator<T>| {
+public abstract interface MutableListIterator<T> : R|kotlin/collections/ListIterator<T>|, R|kotlin/collections/MutableIterator<T>| {
     public abstract fun add(element: R|T|): R|kotlin/Unit|
 
     public abstract operator fun hasNext(): R|kotlin/Boolean|
@@ -207,7 +207,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
 }
 
-<K, V> public abstract interface MutableMap : R|kotlin/collections/Map<K, V>| {
+public abstract interface MutableMap<K, V> : R|kotlin/collections/Map<K, V>| {
     public abstract fun clear(): R|kotlin/Unit|
 
     public abstract fun put(key: R|K|, value: R|V|): R|V|
@@ -218,14 +218,14 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean|
 
-    <K, V> public abstract interface MutableEntry : R|kotlin/collections/Map.Entry<K, V>| {
+    public abstract interface MutableEntry<K, V> : R|kotlin/collections/Map.Entry<K, V>| {
         public abstract fun setValue(newValue: R|V|): R|V|
 
     }
 
 }
 
-<E> public abstract interface MutableSet : R|kotlin/collections/Set<E>|, R|kotlin/collections/MutableCollection<E>| {
+public abstract interface MutableSet<E> : R|kotlin/collections/Set<E>|, R|kotlin/collections/MutableCollection<E>| {
     public abstract fun add(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun addAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
@@ -242,7 +242,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
 }
 
-<E> public abstract interface Set : R|kotlin/collections/Collection<E>| {
+public abstract interface Set<E> : R|kotlin/collections/Collection<E>| {
     public abstract operator fun contains(element: R|E|): R|kotlin/Boolean|
 
     public abstract fun containsAll(elements: R|kotlin/collections/Collection<E>|): R|kotlin/Boolean|
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index 9483fa88030..4dd21f7398c 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -49,7 +49,7 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
 }
 
-<T> public abstract interface ClosedRange : R|kotlin/Any| {
+public abstract interface ClosedRange<T> : R|kotlin/Any| {
     public open operator fun contains(value: R|T|): R|kotlin/Boolean|
 
     public open fun isEmpty(): R|kotlin/Boolean|
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin.txt b/compiler/fir/resolve/testData/builtIns/kotlin.txt
index 77ecf59051c..1a5c6cf6772 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin.txt
@@ -1,6 +1,6 @@
-<T> public final inline fun arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
+public final inline fun <T> arrayOf(vararg elements: R|kotlin/Array<out T>|): R|kotlin/Array<T>|
 
-<T> public final fun arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
+public final fun <T> arrayOfNulls(size: R|kotlin/Int|): R|kotlin/Array<T>|
 
 public final fun booleanArrayOf(vararg elements: R|kotlin/BooleanArray|): R|kotlin/BooleanArray|
 
@@ -10,11 +10,11 @@ public final fun charArrayOf(vararg elements: R|kotlin/CharArray|): R|kotlin/Cha
 
 public final fun doubleArrayOf(vararg elements: R|kotlin/DoubleArray|): R|kotlin/DoubleArray|
 
-<T> public final inline fun emptyArray(): R|kotlin/Array<T>|
+public final inline fun <T> emptyArray(): R|kotlin/Array<T>|
 
-<T> public final inline fun enumValueOf(name: R|kotlin/String|): R|T|
+public final inline fun <T> enumValueOf(name: R|kotlin/String|): R|T|
 
-<T> public final inline fun enumValues(): R|kotlin/Array<T>|
+public final inline fun <T> enumValues(): R|kotlin/Array<T>|
 
 public final fun floatArrayOf(vararg elements: R|kotlin/FloatArray|): R|kotlin/FloatArray|
 
@@ -42,7 +42,7 @@ public open class Any {
 
 }
 
-<T> public final class Array : R|kotlin/Any| {
+public final class Array<T> : R|kotlin/Any| {
     public final operator fun get(index: R|kotlin/Int|): R|T|
 
     public final operator fun iterator(): R|kotlin/collections/Iterator<T>|
@@ -286,7 +286,7 @@ public abstract interface Cloneable : R|kotlin/Any| {
 
 }
 
-<T> public abstract interface Comparable : R|kotlin/Any| {
+public abstract interface Comparable<T> : R|kotlin/Any| {
     public abstract operator fun compareTo(other: R|T|): R|kotlin/Int|
 
 }
@@ -435,7 +435,7 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
 
 }
 
-<E> public abstract class Enum : R|kotlin/Comparable<E>| {
+public abstract class Enum<E> : R|kotlin/Comparable<E>| {
     protected final fun clone(): R|kotlin/Any|
 
     public final operator fun compareTo(other: R|E|): R|kotlin/Int|
@@ -589,7 +589,7 @@ public final class FloatArray : R|kotlin/Any| {
 
 }
 
-<R> public abstract interface Function : R|kotlin/Any| {
+public abstract interface Function<R> : R|kotlin/Any| {
 }
 
 public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
index fe016112d77..dcc27e2fa97 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
@@ -4,7 +4,7 @@ public open class A : R|java/lang/Object| {
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
 }
-<T> public open class B : R|java/lang/Object| {
+public open class B<T> : R|java/lang/Object| {
     public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
index 3b12cc44ef7..eb44231dc54 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
@@ -16,15 +16,15 @@ public final annotation class Ann : R|kotlin/Annotation| {
 
 }
 
-<T> public final class Generic : R|kotlin/Any| {
+public final class Generic<T> : R|kotlin/Any| {
     public constructor(): R|test/Generic<T>|
 
 }
 
-<A, B> public final class InnerGeneric : R|kotlin/Any| {
+public final class InnerGeneric<A, B> : R|kotlin/Any| {
     public constructor(): R|test/InnerGeneric<A, B>|
 
-    <C, D> public final inner class Inner : R|kotlin/Any| {
+    public final inner class Inner<C, D> : R|kotlin/Any| {
         public constructor(): R|test/InnerGeneric.Inner<C, D>|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
index 75091d348dd..669a1c51101 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class TypeParameterAnnotation : R|kotlin/Any| {
-    <T> public final fun foo(x: R|T|): R|kotlin/Unit|
+    public final fun <T> foo(x: R|T|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterAnnotation|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
index 35430245b58..7ec93a11e6f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -3,7 +3,7 @@ public final annotation class A : R|kotlin/Annotation| {
 
 }
 
-<T> public abstract interface Foo : R|java/io/Serializable| {
-    <E, F> public abstract fun bar(): R|kotlin/Unit|
+public abstract interface Foo<T> : R|java/io/Serializable| {
+    public abstract fun <E, F> bar(): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
index fbc8ed5314b..32de59c1618 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
@@ -4,7 +4,7 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
-    <T> public final fun foo(x: R|T|): R|kotlin/Unit|
+    public final fun <T> foo(x: R|T|): R|kotlin/Unit|
 
     public constructor(): R|test/SimpleTypeParameterAnnotation|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
index d6011a64bee..3d65f232fd1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
@@ -4,7 +4,7 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
-    <T> public final fun foo(x: R|T|): R|kotlin/Unit|
+    public final fun <T> foo(x: R|T|): R|kotlin/Unit|
 
     public constructor(): R|test/SimpleTypeParameterAnnotation|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
index 256ca299c40..4eb2ed968a0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
@@ -1,4 +1,4 @@
-<T> public final class Wine : R|kotlin/Any| {
+public final class Wine<T> : R|kotlin/Any| {
     public constructor(): R|test/Wine<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
index 2f48f367614..7c5c5a63146 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
@@ -1,4 +1,4 @@
-<test> public final class ConstructorTypeParamClassObjectConflict : R|kotlin/Any| {
+public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any| {
     public constructor(): R|test/ConstructorTypeParamClassObjectConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
@@ -8,7 +8,7 @@
 
 }
 
-<test> public final class ConstructorTypeParamClassObjectTypeConflict : R|kotlin/Any| {
+public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/Any| {
     public constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
index 39b730383b7..fd806e6afa5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
@@ -1,4 +1,4 @@
-<T> public final class Juice : R|kotlin/Any| {
+public final class Juice<T> : R|kotlin/Any| {
     public constructor(): R|test/Juice<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
index d3d9230ed41..5880bdf26d0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
@@ -1,4 +1,4 @@
-<T> public final class Beer : R|kotlin/Any| {
+public final class Beer<T> : R|kotlin/Any| {
     public constructor(): R|test/Beer<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
index 5ed3c3258bc..7f373ff23b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
@@ -1,4 +1,4 @@
-<A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
+public final class ClassParamReferencesParam<A, B> : R|kotlin/Any| {
     public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
index 5ed3c3258bc..7f373ff23b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
@@ -1,4 +1,4 @@
-<A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
+public final class ClassParamReferencesParam<A, B> : R|kotlin/Any| {
     public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
index 89e37cb5ff5..3e853b0110e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
@@ -1,7 +1,7 @@
-<A> public final class ClassParamReferencesSelf : R|kotlin/Any| {
+public final class ClassParamReferencesSelf<A> : R|kotlin/Any| {
     public constructor(): R|test/ClassParamReferencesSelf<A>|
 
 }
 
-<P> public abstract interface TraitWithP : R|kotlin/Any| {
+public abstract interface TraitWithP<P> : R|kotlin/Any| {
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
index 25e73f4ed28..fc12cacd96a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
@@ -1,4 +1,4 @@
-<A> public final class Clock : R|kotlin/Any| {
+public final class Clock<A> : R|kotlin/Any| {
     public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
index 25e73f4ed28..fc12cacd96a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,4 +1,4 @@
-<A> public final class Clock : R|kotlin/Any| {
+public final class Clock<A> : R|kotlin/Any| {
     public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
index 25e73f4ed28..fc12cacd96a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
@@ -1,4 +1,4 @@
-<A> public final class Clock : R|kotlin/Any| {
+public final class Clock<A> : R|kotlin/Any| {
     public constructor(): R|test/Clock<A>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
index bab20f4b8ae..6de8e251b39 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassTwoParams : R|kotlin/Any| {
+public final class ClassTwoParams<P, Q> : R|kotlin/Any| {
     public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
index bab20f4b8ae..6de8e251b39 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassTwoParams : R|kotlin/Any| {
+public final class ClassTwoParams<P, Q> : R|kotlin/Any| {
     public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
index 18244ac038f..15c0ba9a86e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
@@ -1,4 +1,4 @@
-<P> public abstract class Aaa : R|kotlin/Any| {
+public abstract class Aaa<P> : R|kotlin/Any| {
     public constructor(): R|test/Aaa<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
index 90f422577dd..916b00ae34f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface A : R|kotlin/Any| {
+public abstract interface A<T> : R|kotlin/Any| {
     public abstract fun bar(): R|T|
 
     public open fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
index bbed11acd8e..c2ec95fa7e9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
@@ -1,4 +1,4 @@
-<P> public abstract interface Aaa : R|kotlin/Any| {
+public abstract interface Aaa<P> : R|kotlin/Any| {
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
index 6c4934c8dba..188d0f2df21 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
@@ -1,7 +1,7 @@
 public final class Outer : R|kotlin/Any| {
     public constructor(): R|test/Outer|
 
-    <T> public final inner class Inner : R|kotlin/Any| {
+    public final inner class Inner<T> : R|kotlin/Any| {
         public constructor(): R|test/Outer.Inner<T>|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
index 40e9e4e6d0c..7bba9235e28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
@@ -1,12 +1,12 @@
-<E, F> public final class Outer : R|kotlin/Any| {
+public final class Outer<E, F> : R|kotlin/Any| {
     public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
 
     public constructor(): R|test/Outer<E, F>|
 
-    <G, H> public final inner class Inner : R|kotlin/Any| {
+    public final inner class Inner<G, H> : R|kotlin/Any| {
         public constructor(): R|test/Outer.Inner<G, H>|
 
-        <I> public final inner class Inner3 : R|kotlin/Any| {
+        public final inner class Inner3<I> : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
             public constructor(): R|test/Outer.Inner.Inner3<I>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
index 71db70a17fd..e5ac66e8d62 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
@@ -1,7 +1,7 @@
 public final class Outer : R|kotlin/Any| {
     public constructor(): R|test/Outer|
 
-    <T> public final class Nested : R|kotlin/Any| {
+    public final class Nested<T> : R|kotlin/Any| {
         public constructor(): R|test/Outer.Nested<T>|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/RecursiveGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/RecursiveGeneric.txt
index 63f6085eba9..37c67f57a64 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/RecursiveGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/RecursiveGeneric.txt
@@ -1,4 +1,4 @@
-<R, T> public abstract interface Rec : R|kotlin/Any| {
+public abstract interface Rec<R, T> : R|kotlin/Any| {
     public abstract fun t(): R|T|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
index 86ccc38ceb0..def8994723a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,4 +1,4 @@
-<P> public open class JavaBeanVarOfGenericType : R|kotlin/Any| {
+public open class JavaBeanVarOfGenericType<P> : R|kotlin/Any| {
     public open fun getCharacters(): R|java/util/ArrayList<P>|?
 
     public open fun setCharacters(p0: R|java/util/ArrayList<P>|?): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
index a0aaeebe431..558385893b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
@@ -1,4 +1,4 @@
-<T> public final class ClassParamUsedInFun : R|kotlin/Any| {
+public final class ClassParamUsedInFun<T> : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
     public constructor(): R|test/ClassParamUsedInFun<T>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
index a0aaeebe431..558385893b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
@@ -1,4 +1,4 @@
-<T> public final class ClassParamUsedInFun : R|kotlin/Any| {
+public final class ClassParamUsedInFun<T> : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
     public constructor(): R|test/ClassParamUsedInFun<T>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
index 340ab73bbd9..dc65c392e18 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
@@ -1,4 +1,4 @@
-<T> public open class Base : R|kotlin/Any| {
+public open class Base<T> : R|kotlin/Any| {
     public final fun foo(): R|T|
 
     public constructor(): R|test/Base<T>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
index ba647f8e2e1..93b6590246a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -1,4 +1,4 @@
-<P> public abstract interface Bbb : R|kotlin/Any| {
+public abstract interface Bbb<P> : R|kotlin/Any| {
 }
 
 public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
index d9a8513dccb..701dc239d3a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+public final class ClassWithConstructorAndTypeParameter<P, Q> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index 6611177293c..858f1d01649 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+public final class ClassWithConstructorAndTypeParameter<P, Q> : R|kotlin/Any| {
     public constructor(q: R|kotlin/Int|): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 6db03156dda..02518327201 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+public final class ClassWithConstructorAndTypeParameter<P, Q> : R|kotlin/Any| {
     public constructor(q: R|Q|): R|test/ClassWithConstructorAndTypeParameter<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
index eb54208d6e6..24493b8e946 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
@@ -1,4 +1,4 @@
-<P> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+public final class ClassWithConstructorAndTypeParameter<P> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithConstructorAndTypeParameter<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index 67f602549ee..b86b1a41e64 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class OneTypeParameterErased : R|kotlin/Any| {
+public final class OneTypeParameterErased<P, Q> : R|kotlin/Any| {
     public constructor(q: R|Q|): R|test/OneTypeParameterErased<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
index 3300b166231..e6761c66586 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
@@ -1,4 +1,4 @@
-<P> public final class ClassWithTypeP : R|kotlin/Any| {
+public final class ClassWithTypeP<P> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithTypeP<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
index 3e9e0fb7f37..429f038788f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
@@ -1,4 +1,4 @@
-<P> public abstract class ClassWithTypePExtendsIterableP : R|kotlin/collections/MutableIterable<P>| {
+public abstract class ClassWithTypePExtendsIterableP<P> : R|kotlin/collections/MutableIterable<P>| {
     public constructor(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
index d38f7067dfb..c8880bc0152 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
@@ -1,4 +1,4 @@
-<P, Q> public final class ClassWithTypePP : R|kotlin/Any| {
+public final class ClassWithTypePP<P, Q> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithTypePP<P, Q>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
index 0b708191139..c0d18c4b568 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
@@ -1,4 +1,4 @@
-<R, P> public open class ClassWithTypePRefNext : R|kotlin/Any| {
+public open class ClassWithTypePRefNext<R, P> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
index 4e9c8edebba..272f57e4902 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
@@ -1,4 +1,4 @@
-<P> public final class ClassWithTypePRefSelf : R|kotlin/Any| {
+public final class ClassWithTypePRefSelf<P> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithTypePRefSelf<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
index c31416ee423..142dfb3800e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ClassWithTypePRefSelfAndClass : R|kotlin/Any| {
+public final class ClassWithTypePRefSelfAndClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt
index 286d297a270..aa130e2f388 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt
@@ -1 +1 @@
-<T> public final fun foo(t: R|T|): R|T|
+public final fun <T> foo(t: R|T|): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
index d5cbc87c231..ee6ba40e2c2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -4,14 +4,14 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String, kotlin/CharSequence>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence, kotlin/String>| {
     }
 
-    <F, B> public abstract interface Super1 : R|kotlin/Any| {
+    public abstract interface Super1<F, B> : R|kotlin/Any| {
         public abstract fun bar(): R|B|
 
         public abstract fun foo(): R|F|
 
     }
 
-    <FF, BB> public abstract interface Super2 : R|kotlin/Any| {
+    public abstract interface Super2<FF, BB> : R|kotlin/Any| {
         public abstract fun bar(): R|BB|
 
         public abstract fun foo(): R|FF|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
index bd0f4c765f8..9b753be1dbe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    <T> public open fun bar(): R|kotlin/Unit|
+    public open fun <T> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
index 87bfade0b0d..83a9a30804a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    <T> public open fun foo(): R|kotlin/Unit|
+    public open fun <T> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
index 940781f38b9..92da7df8d29 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypeP : R|kotlin/Any| {
-    <P> public final fun f(): R|kotlin/Unit|
+    public final fun <P> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeP|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
index c32d2e50d0a..4eece75ea21 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    <P, Q> public final fun f(): R|kotlin/Unit|
+    public final fun <P, Q> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
index 06c2a1b0f97..a75678c6344 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
@@ -1,5 +1,5 @@
-<P> public open class MethodWithTypePRefClassP : R|kotlin/Any| {
-    <Q> public final fun f(): R|kotlin/Unit|
+public open class MethodWithTypePRefClassP<P> : R|kotlin/Any| {
+    public final fun <Q> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePRefClassP<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
index 7aed5c82d59..231c35ce24f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
@@ -1,5 +1,5 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
-    <P> public final fun f(p0: R|P|): R|kotlin/Unit|
+    public final fun <P> f(p0: R|P|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
index c9fda857309..c1968bcc282 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
@@ -3,7 +3,7 @@ public final class UnboundWildcard : R|kotlin/Any| {
 
     public constructor(): R|test/UnboundWildcard|
 
-    <T> public abstract interface MyClass : R|kotlin/Any| {
+    public abstract interface MyClass<T> : R|kotlin/Any| {
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
index 75f81629991..e1b6b37326e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    <T> public open fun foo(): R|kotlin/Unit|
+    public open fun <T> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
index fa61cbe7ece..ed78368b0f6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,4 +1,4 @@
-<T> public open class ConstructorWithNewTypeParams : R|kotlin/Any| {
+public open class ConstructorWithNewTypeParams<T> : R|kotlin/Any| {
     public constructor(first: R|kotlin/Any|): R|test/ConstructorWithNewTypeParams<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
index 79662830220..852c8643c2c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,4 +1,4 @@
-<T> public open class ConstructorWithParentTypeParams : R|kotlin/Any| {
+public open class ConstructorWithParentTypeParams<T> : R|kotlin/Any| {
     public constructor(first: R|T|): R|test/ConstructorWithParentTypeParams<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
index 65e7e50e344..224e734c334 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -1,5 +1,5 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    <T> public open fun copy(dest: R|kotlin/collections/MutableList<in T>|, src: R|kotlin/collections/List<T>|): R|kotlin/Unit|
+    public open fun <T> copy(dest: R|kotlin/collections/MutableList<in T>|, src: R|kotlin/collections/List<T>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithMappedClasses|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
index 65b7a331817..fd85755eabe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    <A, B> public open fun foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
+    public open fun <A, B> foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
index 5a9c9d18ebe..e32f822dfea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,4 +1,4 @@
-<T> public open class PropertyArrayTypes : R|kotlin/Any| {
+public open class PropertyArrayTypes<T> : R|kotlin/Any| {
     public constructor(): R|test/PropertyArrayTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
index c13ea9c0904..f3eeebdde70 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,4 +1,4 @@
-<T> public open class PropertyComplexTypes : R|kotlin/Any| {
+public open class PropertyComplexTypes<T> : R|kotlin/Any| {
     public constructor(): R|test/PropertyComplexTypes<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
index 9b73765808f..fb26f90d9da 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
@@ -3,7 +3,7 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
-    <T> public abstract interface MyClass : R|kotlin/Any| {
+    public abstract interface MyClass<T> : R|kotlin/Any| {
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
index fa327a38149..88b997fbb5c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,5 +1,5 @@
 public open class ExtraUpperBound : R|kotlin/Any| {
-    <A> public open fun foo(): R|kotlin/String|?
+    public open fun <A> foo(): R|kotlin/String|?
 
     public constructor(): R|test/ExtraUpperBound|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
index d0b4d801184..159a959295f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
@@ -1,5 +1,5 @@
 public open class MissingUpperBound : R|kotlin/Any| {
-    <A> public open fun foo(): R|kotlin/String|?
+    public open fun <A> foo(): R|kotlin/String|?
 
     public constructor(): R|test/MissingUpperBound|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 7da3b493ddc..9f61a2ce55f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index 5deed3fc264..838ce30f000 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure2|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index 61165f680f5..9cbe11aa344 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParametersCount : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParametersCount|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
index 53237d4d5a0..4eeb7c0c4f1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
@@ -1,5 +1,5 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    <E> public abstract interface Middle : R|test/DeeplySubstitutedClassParameter.Super<E>| {
+    public abstract interface Middle<E> : R|test/DeeplySubstitutedClassParameter.Super<E>| {
         public abstract fun foo(t: R|E|): R|kotlin/Unit|
 
     }
@@ -9,7 +9,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(t: R|T|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
index 3a48bdc0c86..cd903b1457d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
@@ -1,5 +1,5 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    <E> public abstract interface Middle : R|test/DeeplySubstitutedClassParameter2.Super<E>| {
+    public abstract interface Middle<E> : R|test/DeeplySubstitutedClassParameter2.Super<E>| {
     }
 
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String>| {
@@ -7,7 +7,7 @@ public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(t: R|T|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
index b99f4d9c104..eada6352304 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -11,7 +11,7 @@ public abstract interface Kt3302 : R|kotlin/Any| {
 
     }
 
-    <K, V> public abstract interface LinkedHashMap : R|kotlin/Any| {
+    public abstract interface LinkedHashMap<K, V> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun put(key: R|K|, value: R|V|): R|V|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
index 588369401d1..d840a18ceb3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
@@ -1,10 +1,10 @@
 public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
-    <T> public abstract interface Sub : R|test/OverrideWithErasedParameter.Super<T>| {
+    public abstract interface Sub<T> : R|test/OverrideWithErasedParameter.Super<T>| {
         public abstract fun foo(p0: R|T|): R|kotlin/Unit|
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(p0: R|T|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
index 32eb7975f33..0afc7ac4ac2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
@@ -1,5 +1,5 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
-    <T> public abstract interface Generic : R|kotlin/Any| {
+    public abstract interface Generic<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(key: R|T|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
index 546fa35e908..1c6a4facdc3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(t: R|T|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
index 46ea1842adc..3714fd06857 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
@@ -4,14 +4,14 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super1 : R|kotlin/Any| {
+    public abstract interface Super1<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(t: R|T|): R|kotlin/Unit|
 
     }
 
-    <E> public abstract interface Super2 : R|kotlin/Any| {
+    public abstract interface Super2<E> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(t: R|E|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
index d95d3002fd3..4019c766555 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
@@ -1,5 +1,5 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    <E> public abstract interface Middle : R|test/DeeplySubstitutedClassParameter.Super<E>| {
+    public abstract interface Middle<E> : R|test/DeeplySubstitutedClassParameter.Super<E>| {
         public abstract fun foo(): R|E|
 
     }
@@ -9,7 +9,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
index f8a8f05cbac..99e0b308da7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
@@ -1,5 +1,5 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    <E> public abstract interface Middle : R|test/DeeplySubstitutedClassParameter2.Super<E>| {
+    public abstract interface Middle<E> : R|test/DeeplySubstitutedClassParameter2.Super<E>| {
     }
 
     public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String>| {
@@ -7,7 +7,7 @@ public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 4e5588fb2b1..08efe649876 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -11,7 +11,7 @@ public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
 
     }
 
-    <X, E> public abstract interface TrickyList : R|kotlin/collections/MutableList<E>| {
+    public abstract interface TrickyList<X, E> : R|kotlin/collections/MutableList<E>| {
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
index 0e760e13ee2..2e9efbbafea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
@@ -1,5 +1,5 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
-    <T> public abstract interface Generic : R|kotlin/Any| {
+    public abstract interface Generic<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index 39379bb28af..172a2ce78b6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -1,4 +1,4 @@
-<E> public abstract interface SubclassOfCollection : R|kotlin/collections/MutableCollection<E>| {
+public abstract interface SubclassOfCollection<E> : R|kotlin/collections/MutableCollection<E>| {
     public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<E>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index ad461cd9a66..a3e3e045b34 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,4 +1,4 @@
-<K, V> public abstract interface SubclassOfMapEntry : R|kotlin/collections/MutableMap.MutableEntry<K, V>| {
+public abstract interface SubclassOfMapEntry<K, V> : R|kotlin/collections/MutableMap.MutableEntry<K, V>| {
     public abstract fun setValue(value: R|V|): R|V|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
index 8f06dab6f72..faed24e40cd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
index 9ee4ef0da41..c1d56ebaa57 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
@@ -4,14 +4,14 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super1 : R|kotlin/Any| {
+    public abstract interface Super1<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
 
     }
 
-    <E> public abstract interface Super2 : R|kotlin/Any| {
+    public abstract interface Super2<E> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|E|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
index 09cc563f9d7..37ce20121cb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
@@ -1,10 +1,10 @@
 public abstract interface TypeParamOfClass : R|kotlin/Any| {
-    <T> public abstract interface Sub : R|test/TypeParamOfClass.Super<T>| {
+    public abstract interface Sub<T> : R|test/TypeParamOfClass.Super<T>| {
         public abstract fun foo(): R|T|
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
index c69dc1e6a3a..6c685ffbde8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
@@ -4,7 +4,7 @@ public abstract interface TypeParamOfClassSubstituted : R|kotlin/Any| {
 
     }
 
-    <T> public abstract interface Super : R|kotlin/Any| {
+    public abstract interface Super<T> : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
         public abstract fun foo(): R|T|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
index cef5a463c53..8c10a79999f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
@@ -1,13 +1,13 @@
 public abstract interface TypeParamOfFun : R|kotlin/Any| {
     public abstract interface Sub : R|test/TypeParamOfFun.Super| {
-        <E> public abstract fun foo(): R|E|
+        public abstract fun <E> foo(): R|E|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        <T> public abstract fun foo(): R|T|
+        public abstract fun <T> foo(): R|T|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index 09ae8c3f699..7be336756e6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -1,11 +1,11 @@
 public abstract interface InheritMutability : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritMutability.Super| {
-        <B> public abstract fun foo(a: R|B|): R|kotlin/Unit|
+        public abstract fun <B> foo(a: R|B|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A> public abstract fun foo(a: R|A|): R|kotlin/Unit|
+        public abstract fun <A> foo(a: R|A|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
index ba23e928e02..31e77ec6777 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
@@ -1,11 +1,11 @@
 public abstract interface InheritNullability : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNullability.Super| {
-        <B> public abstract fun foo(a: R|B|): R|kotlin/Unit|
+        public abstract fun <B> foo(a: R|B|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A> public abstract fun foo(a: R|A|): R|kotlin/Unit|
+        public abstract fun <A> foo(a: R|A|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index 3d94927958d..fc8cb8be2e9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -1,11 +1,11 @@
 public abstract interface InheritReadOnliness : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritReadOnliness.Super| {
-        <B> public abstract fun foo(a: R|B|): R|kotlin/Unit|
+        public abstract fun <B> foo(a: R|B|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A> public abstract fun foo(a: R|A|): R|kotlin/Unit|
+        public abstract fun <A> foo(a: R|A|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
index 10e30bebc5d..79f8fe4830e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
@@ -1,11 +1,11 @@
 public abstract interface TwoBounds : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoBounds.Super| {
-        <B> public abstract fun foo(a: R|B|): R|kotlin/Unit|
+        public abstract fun <B> foo(a: R|B|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A> public abstract fun foo(a: R|A|): R|kotlin/Unit|
+        public abstract fun <A> foo(a: R|A|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
index 1fe128697c5..e1f2b598af6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclasses : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| {
-        <C> public abstract fun foo(a: R|C|): R|kotlin/Unit|
+        public abstract fun <C> foo(a: R|C|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super1 : R|kotlin/Any| {
-        <A> public abstract fun foo(a: R|A|): R|kotlin/Unit|
+        public abstract fun <A> foo(a: R|A|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
-        <B> public abstract fun foo(a: R|B|): R|kotlin/Unit|
+        public abstract fun <B> foo(a: R|B|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
index d45774beea1..54bdebbc0fc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
@@ -1,11 +1,11 @@
 public abstract interface TwoTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoTypeParameters.Super| {
-        <B, A> public abstract fun foo(a: R|B|, b: R|A|): R|kotlin/Unit|
+        public abstract fun <B, A> foo(a: R|B|, b: R|A|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A, B> public abstract fun foo(a: R|A|, b: R|B|): R|kotlin/Unit|
+        public abstract fun <A, B> foo(a: R|A|, b: R|B|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
index d83cd14b82f..ceb845c0d70 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
@@ -1,11 +1,11 @@
 public abstract interface UseParameterAsUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| {
-        <B, A> public abstract fun foo(a: R|B|, b: R|A|): R|kotlin/Unit|
+        public abstract fun <B, A> foo(a: R|B|, b: R|A|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A, B> public abstract fun foo(a: R|A|, b: R|B|): R|kotlin/Unit|
+        public abstract fun <A, B> foo(a: R|A|, b: R|B|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index c4769153b3f..85d5e1c7708 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -1,11 +1,11 @@
 public abstract interface UseParameterInUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBound.Super| {
-        <B, A> public abstract fun foo(a: R|B|, b: R|A|): R|kotlin/Unit|
+        public abstract fun <B, A> foo(a: R|B|, b: R|A|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A, B> public abstract fun foo(a: R|A|, b: R|B|): R|kotlin/Unit|
+        public abstract fun <A, B> foo(a: R|A|, b: R|B|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index a575d2ae213..8864547b201 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -1,11 +1,11 @@
 public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| {
-        <B, A> public abstract fun foo(b: R|B|, a: R|A|): R|kotlin/Unit|
+        public abstract fun <B, A> foo(b: R|B|, a: R|A|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        <A, B> public abstract fun foo(a: R|A|, b: R|B|): R|kotlin/Unit|
+        public abstract fun <A, B> foo(a: R|A|, b: R|B|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
index 68ebe69b017..e0ce9470481 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterable : R|kotlin/Any| {
+public abstract interface LoadIterable<T> : R|kotlin/Any| {
     public abstract fun getIterable(): R|kotlin/collections/MutableIterable<T>|?
 
     public abstract fun setIterable(p0: R|kotlin/collections/Iterable<T>|?): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
index 51b72ecbb13..4a942f1873c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterator : R|kotlin/Any| {
+public abstract interface LoadIterator<T> : R|kotlin/Any| {
     public abstract fun getIterator(): R|kotlin/collections/MutableIterator<T>|?
 
     public abstract fun setIterator(p0: R|kotlin/collections/Iterator<T>|?): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
index 349e6a6d5c4..f75467b993d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    <T> public open fun max(p0: R|kotlin/collections/Collection<T>|?): R|T|
+    public open fun <T> max(p0: R|kotlin/collections/Collection<T>|?): R|T|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
index 2f9942c31a6..3a123cdd1b4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -1 +1 @@
-<T> public final fun f(): R|kotlin/Int|
+public final fun <T> f(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt
index 11605336e81..8b37587568d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt
@@ -1 +1 @@
-<P> public final fun funParamParam(a: R|kotlin/Int|, b: R|P|): R|kotlin/Int|
+public final fun <P> funParamParam(a: R|kotlin/Int|, b: R|P|): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
index 11605336e81..8b37587568d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
@@ -1 +1 @@
-<P> public final fun funParamParam(a: R|kotlin/Int|, b: R|P|): R|kotlin/Int|
+public final fun <P> funParamParam(a: R|kotlin/Int|, b: R|P|): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index 18629fb9620..69ec79eeeec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1 +1 @@
-<P, Q> public final fun funParamReferencesParam(): R|kotlin/Int|
+public final fun <P, Q> funParamReferencesParam(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index 19e63e64b45..97f26433ea5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -1,4 +1,4 @@
-<T> public final fun foo(): R|kotlin/Unit|
+public final fun <T> foo(): R|kotlin/Unit|
 
 public abstract interface Bar : R|kotlin/Any| {
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index 3c4d555bd6c..61a8936c787 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1 +1 @@
-<A> public final fun uno(): R|kotlin/Int|
+public final fun <A> uno(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index f1ee6b1a096..e79087fdac7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1 +1 @@
-<A> public final fun tres(): R|kotlin/Int|
+public final fun <A> tres(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index 339e0e64ee2..07d34cac557 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1 +1 @@
-<A> public final fun dos(): R|kotlin/Int|
+public final fun <A> dos(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
index fa5e3746a01..b50dbb43245 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -1 +1 @@
-<P> public final fun funParamVarargParam(a: R|kotlin/Int|, vararg b: R|kotlin/Array<out P>|): R|kotlin/Int|
+public final fun <P> funParamVarargParam(a: R|kotlin/Int|, vararg b: R|kotlin/Array<out P>|): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
index 49956cb40d2..0f7ac87e928 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -1 +1 @@
-<P, Q> public final fun funTwoTypeParams(): R|kotlin/Int|
+public final fun <P, Q> funTwoTypeParams(): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
index e57b3e1d76c..1ef97bd5fe8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
@@ -1,16 +1,16 @@
-<TA> public final class A : R|kotlin/Any| {
+public final class A<TA> : R|kotlin/Any| {
     public constructor(): R|test/A<TA>|
 
-    <TB> public final inner class B : R|kotlin/Any| {
+    public final inner class B<TB> : R|kotlin/Any| {
         public constructor(): R|test/A.B<TB>|
 
-        <TC> public final inner class C : R|kotlin/Any| {
+        public final inner class C<TC> : R|kotlin/Any| {
             public constructor(): R|test/A.B.C<TC>|
 
-            <TD> public final inner class D : R|kotlin/Any| {
+            public final inner class D<TD> : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
-                <P1, P2, P3, P4> public final fun foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
+                public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
 
                 public constructor(): R|test/A.B.C.D<TD>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
index cbf82aa510f..ce11b748a28 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
@@ -1,7 +1,7 @@
-<P> public final class InnerClassReferencesOuterTP : R|kotlin/Any| {
+public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
     public constructor(): R|test/InnerClassReferencesOuterTP<P>|
 
-    <Q> public final inner class Inner : R|kotlin/Any| {
+    public final inner class Inner<Q> : R|kotlin/Any| {
         public constructor(): R|test/InnerClassReferencesOuterTP.Inner<Q>|
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
index bd5a3a32ca9..fc646c4f627 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
@@ -1,8 +1,8 @@
-<P> public final class MembersReferenceOuterTP : R|kotlin/Any| {
+public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
     public constructor(): R|test/MembersReferenceOuterTP<P>|
 
     public final inner class Inner : R|kotlin/Any| {
-        <Q> public final fun f(): R|kotlin/Unit|
+        public final fun <Q> f(): R|kotlin/Unit|
 
         public final fun g(p: R|P|): R|P|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
index ccbbef80644..a1263cca6d9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
@@ -1,4 +1,4 @@
-<T> public final class ExtValInClass : R|kotlin/Any| {
+public final class ExtValInClass<T> : R|kotlin/Any| {
     public constructor(): R|test/ExtValInClass<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
index cb2097c35a8..180614aa28b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValInClass : R|kotlin/Any| {
+public final class ExtValInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
index a121342523e..227e12c58d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValPIntInClass : R|kotlin/Any| {
+public final class ExtValPIntInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
index cb2097c35a8..180614aa28b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValInClass : R|kotlin/Any| {
+public final class ExtValInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
index cb2097c35a8..180614aa28b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValInClass : R|kotlin/Any| {
+public final class ExtValInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
index a121342523e..227e12c58d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValPIntInClass : R|kotlin/Any| {
+public final class ExtValPIntInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
index a121342523e..227e12c58d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,4 +1,4 @@
-<P> public final class ExtValPIntInClass : R|kotlin/Any| {
+public final class ExtValPIntInClass<P> : R|kotlin/Any| {
     public constructor(): R|test/ExtValPIntInClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
index 928a4b0c13a..eebd5725c1d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
@@ -3,7 +3,7 @@ public final class A : R|kotlin/Any| {
 
 }
 
-<T> public final class MyProperty : R|kotlin/Any| {
+public final class MyProperty<T> : R|kotlin/Any| {
     public final operator fun getValue(t: R|T|, p: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int|
 
     public final operator fun setValue(t: R|T|, p: R|kotlin/reflect/KProperty<*>|, i: R|kotlin/Int|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/ArrayOfOutT.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/ArrayOfOutT.txt
index 98a9ff7b9e0..84265984132 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/ArrayOfOutT.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/ArrayOfOutT.txt
@@ -1 +1 @@
-<T> public final fun nothing(): R|kotlin/Array<out T>|
+public final fun <T> nothing(): R|kotlin/Array<out T>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
index a9a034a5128..a63faa7e950 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
@@ -1,6 +1,6 @@
-<P> public final fun foo(x: R|kotlin/Function1<test/Foo<P>, kotlin/Unit>|): R|kotlin/Unit|
+public final fun <P> foo(x: R|kotlin/Function1<test/Foo<P>, kotlin/Unit>|): R|kotlin/Unit|
 
-<T> public final class Foo : R|kotlin/Any| {
+public final class Foo<T> : R|kotlin/Any| {
     public constructor(): R|test/Foo<T>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
index ff2207b6e80..1867a6288b0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
@@ -1,4 +1,4 @@
-<I> public final class A : R|kotlin/Any| {
+public final class A<I> : R|kotlin/Any| {
     private/*private to this*/ final fun bas(): R|I|
 
     public constructor(): R|test/A<I>|
diff --git a/compiler/fir/resolve/testData/resolve/derivedClass.txt b/compiler/fir/resolve/testData/resolve/derivedClass.txt
index f6b7dde87ad..ab87d9eb982 100644
--- a/compiler/fir/resolve/testData/resolve/derivedClass.txt
+++ b/compiler/fir/resolve/testData/resolve/derivedClass.txt
@@ -1,5 +1,5 @@
 FILE: derivedClass.kt
-    <T> public open class Base : R|kotlin/Any| {
+    public open class Base<T> : R|kotlin/Any| {
         public constructor<T>(x: R|T|): R|Base<T>| {
             super<R|kotlin/Any|>()
         }
@@ -8,12 +8,12 @@ FILE: derivedClass.kt
             public get(): R|T|
 
     }
-    <T : R|kotlin/Any|> public final class Derived : R|Base<T>| {
+    public final class Derived<T : R|kotlin/Any|> : R|Base<T>| {
         public constructor<T : R|kotlin/Any|>(x: R|T|): R|Derived<T>| {
             super<R|Base<T>|>(R|<local>/x|)
         }
 
     }
-    <T : R|kotlin/Any|> public final fun create(x: R|T|): R|Derived<T>| {
+    public final fun <T : R|kotlin/Any|> create(x: R|T|): R|Derived<T>| {
         ^create R|/Derived.Derived|(R|<local>/x|)
     }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
index db0d621b822..971702c1ca1 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt
@@ -1,10 +1,10 @@
 FILE: complexTypes.kt
-    <T, out S> public final class C : R|kotlin/Any| {
+    public final class C<T, out S> : R|kotlin/Any| {
         public constructor<T, out S>(): R|a/b/C<T, S>| {
             super<R|kotlin/Any|>()
         }
 
-        <R, in P> public final inner class D : R|kotlin/Any| {
+        public final inner class D<R, in P> : R|kotlin/Any| {
             public constructor<R, in P>(): R|a/b/C.D<R, P>| {
                 super<R|kotlin/Any|>()
             }
diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
index 2134c061262..fb1fd298c06 100644
--- a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
+++ b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt
@@ -1,5 +1,5 @@
 FILE: typeParameters.kt
-    <out T : R|kotlin/Any|> public abstract interface List : R|kotlin/Any| {
+    public abstract interface List<out T : R|kotlin/Any|> : R|kotlin/Any| {
         public abstract operator fun get(index: R|kotlin/Int|): R|T|
 
         public abstract infix fun concat(other: R|List<T>|): R|List<T>|
@@ -7,7 +7,7 @@ FILE: typeParameters.kt
     }
     public final typealias StringList = R|List<out kotlin/String>|
     public final typealias AnyList = R|List<*>|
-    <out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>| {
+    public abstract class AbstractList<out T : R|kotlin/Any|> : R|List<T>| {
         public constructor<out T : R|kotlin/Any|>(): R|AbstractList<T>| {
             super<R|kotlin/Any|>()
         }
diff --git a/compiler/fir/resolve/testData/resolve/ft.txt b/compiler/fir/resolve/testData/resolve/ft.txt
index 7aa21cf3583..b8069a6bdda 100644
--- a/compiler/fir/resolve/testData/resolve/ft.txt
+++ b/compiler/fir/resolve/testData/resolve/ft.txt
@@ -1,5 +1,5 @@
 FILE: ft.kt
-    <T> public abstract interface KMutableProperty1 : R|KProperty1<T>| {
+    public abstract interface KMutableProperty1<T> : R|KProperty1<T>| {
     }
-    <T> public abstract interface KProperty1 : R|kotlin/Function1| {
+    public abstract interface KProperty1<T> : R|kotlin/Function1| {
     }
diff --git a/compiler/fir/resolve/testData/resolve/functionTypes.txt b/compiler/fir/resolve/testData/resolve/functionTypes.txt
index 35e8531b458..f927b47d810 100644
--- a/compiler/fir/resolve/testData/resolve/functionTypes.txt
+++ b/compiler/fir/resolve/testData/resolve/functionTypes.txt
@@ -1,17 +1,17 @@
 FILE: functionTypes.kt
-    <T> public final fun simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| {
+    public final fun <T> simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| {
         ^simpleRun <Unresolved name: f>#()
     }
-    <T, R> public final fun R|kotlin/collections/List<T>|.simpleMap(f: R|kotlin/Function1|): R|R| {
+    public final fun <T, R> R|kotlin/collections/List<T>|.simpleMap(f: R|kotlin/Function1|): R|R| {
     }
-    <T> public final fun simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| {
+    public final fun <T> simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| {
         ^simpleWith R|<local>/t|.<Unresolved name: f>#()
     }
-    <T, R> public abstract interface KMutableProperty1 : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
+    public abstract interface KMutableProperty1<T, R> : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
     }
-    <T, out R> public abstract interface KProperty1 : R|KProperty<R>|, R|kotlin/Function1| {
+    public abstract interface KProperty1<T, out R> : R|KProperty<R>|, R|kotlin/Function1| {
     }
-    <out R> public abstract interface KProperty : R|kotlin/Any| {
+    public abstract interface KProperty<out R> : R|kotlin/Any| {
     }
-    <R> public abstract interface KMutableProperty : R|kotlin/Any| {
+    public abstract interface KMutableProperty<R> : R|kotlin/Any| {
     }
diff --git a/compiler/fir/resolve/testData/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
index d3ef56848ce..0d2010ef6c4 100644
--- a/compiler/fir/resolve/testData/resolve/genericFunctions.txt
+++ b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
@@ -1,7 +1,7 @@
 FILE: genericFunctions.kt
     public abstract interface Any : R|kotlin/Any| {
     }
-    <reified T : R|Any|> public final inline fun R|Any|.safeAs(): R|T|? {
+    public final inline fun <reified T : R|Any|> R|Any|.safeAs(): R|T|? {
         ^safeAs (this# as? R|T|)
     }
     public abstract class Summator : R|kotlin/Any| {
@@ -9,6 +9,6 @@ FILE: genericFunctions.kt
             super<R|kotlin/Any|>()
         }
 
-        <T> public abstract fun plus(first: R|T|, second: R|T|): R|T|
+        public abstract fun <T> plus(first: R|T|, second: R|T|): R|T|
 
     }
diff --git a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
index e27aa51d58f..b5581c1b58b 100644
--- a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
+++ b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt
@@ -1,5 +1,5 @@
 FILE: simpleFakeOverride.kt
-    <T> public open class A : R|kotlin/Any| {
+    public open class A<T> : R|kotlin/Any| {
         public constructor<T>(): R|A<T>| {
             super<R|kotlin/Any|>()
         }
diff --git a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
index 4189878cb62..4b45562d0c1 100644
--- a/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
+++ b/compiler/fir/resolve/testData/resolve/typeAliasWithGeneric.txt
@@ -5,7 +5,7 @@ FILE: typeAliasWithGeneric.kt
         }
 
     }
-    <S, T : R|A|> public abstract interface B : R|kotlin/Any| {
+    public abstract interface B<S, T : R|A|> : R|kotlin/Any| {
     }
     public final class D : R|C<A>| {
         public constructor(): R|D| {
@@ -13,4 +13,4 @@ FILE: typeAliasWithGeneric.kt
         }
 
     }
-    <T> public final typealias C = R|B<T, A>|
+    public final typealias C<T> = R|B<T, A>|
diff --git a/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt
index 9845fee0458..b062c71abef 100644
--- a/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt
+++ b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt
@@ -1,5 +1,5 @@
 FILE: typeParameterInPropertyReceiver.kt
-    <T : R|kotlin/Any|> public final val R|T|.self: R|T|
+    public final val <T : R|kotlin/Any|> R|T|.self: R|T|
         public get(): R|T| {
             ^ this#
         }
diff --git a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
index 0c7d4fb6e26..c81fe8397a3 100644
--- a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
+++ b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt
@@ -1,7 +1,7 @@
 FILE: typeParameterVsNested.kt
     public abstract interface Some : R|kotlin/Any| {
     }
-    <T : R|test/Some|> public abstract class My : R|kotlin/Any| {
+    public abstract class My<T : R|test/Some|> : R|kotlin/Any| {
         public constructor<T : R|test/My.Some|>(): R|test/My<T>| {
             super<R|kotlin/Any|>()
         }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index f0b799549ee..30f295355b0 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -14,11 +14,8 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition
 import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
 import org.jetbrains.kotlin.fir.expressions.impl.FirWhenSubjectExpression
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeSymbol
-import org.jetbrains.kotlin.fir.symbols.ConeClassifierSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
-import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
@@ -31,6 +28,7 @@ fun FirElement.renderWithType(): String = buildString {
     append(": ")
     this@renderWithType.accept(FirRenderer(this))
 }
+
 fun FirElement.render(): String = buildString { this@render.accept(FirRenderer(this)) }
 
 
@@ -206,10 +204,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
 
     override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) {
         memberDeclaration.annotations.renderAnnotations()
-        memberDeclaration.typeParameters.renderTypeParameters()
-        if (memberDeclaration.typeParameters.isNotEmpty()) {
-            print(" ")
-        }
         print(memberDeclaration.visibility.asString() + " " + memberDeclaration.modalityAsString() + " ")
         if (memberDeclaration.isExpect) {
             print("expect ")
@@ -273,6 +267,14 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         visitDeclaration(namedDeclaration)
         if (namedDeclaration !is FirCallableDeclaration) { // Handled by visitCallableDeclaration
             print(" " + namedDeclaration.name)
+            if (namedDeclaration is FirClassLikeDeclaration) {
+                namedDeclaration.typeParameters.renderTypeParameters()
+            }
+        } else if (namedDeclaration is FirMemberDeclaration) {
+            if (namedDeclaration.typeParameters.isNotEmpty()) {
+                print(" ")
+                namedDeclaration.typeParameters.renderTypeParameters()
+            }
         }
     }
 
@@ -715,15 +717,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         visitTypeRefWithNullability(functionTypeRef)
     }
 
-    private fun ConeClassifierSymbol.asString(): String {
-        return when (this) {
-            is ConeClassLikeSymbol -> classId.asString()
-            is FirTypeParameterSymbol -> fir.name.asString()
-            else -> "Unsupported: ${this::class}"
-        }
-    }
-
-
     override fun visitResolvedTypeRef(resolvedTypeRef: FirResolvedTypeRef) {
         resolvedTypeRef.annotations.renderAnnotations()
         print("R|")
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
index 3171021c35a..9b778e00785 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
@@ -1,2 +1,2 @@
-<P> public final class ClassWithTypeP : R|java/lang/Object| {
+public final class ClassWithTypeP<P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
index e878149c17d..75010e0ef4f 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
@@ -1,2 +1,2 @@
-<P> public abstract class ClassWithTypePExtendsIterableP : R|java/lang/Object|, R|java/lang/Iterable<P>| {
+public abstract class ClassWithTypePExtendsIterableP<P> : R|java/lang/Object|, R|java/lang/Iterable<P>| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
index edd7a9f00e8..3e030fe0053 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
@@ -1,2 +1,2 @@
-<P, Q> public final class ClassWithTypePP : R|java/lang/Object| {
+public final class ClassWithTypePP<P, Q> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
index c526d069162..218e83bf416 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
@@ -1,2 +1,2 @@
-<R, P> public open class ClassWithTypePRefNext : R|java/lang/Object| {
+public open class ClassWithTypePRefNext<R, P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
index c8bd95e58a1..11a5b7541a9 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
@@ -1,2 +1,2 @@
-<P> public final class ClassWithTypePRefSelf : R|java/lang/Object| {
+public final class ClassWithTypePRefSelf<P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
index 59e80869126..b1b96d2e6a2 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
@@ -1,2 +1,2 @@
-<P> public final class ClassWithTypePRefSelfAndClass : R|java/lang/Object| {
+public final class ClassWithTypePRefSelfAndClass<P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
index 78012eccfc5..f7a3e8f6c39 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
@@ -1,2 +1,2 @@
-<P> public open class InnerClassReferencesOuterTP : R|java/lang/Object| {
+public open class InnerClassReferencesOuterTP<P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
index 439d1b163c7..64c4db94ccf 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
@@ -1,2 +1,2 @@
-<P, Q> public open class InnerClassesInGeneric : R|java/lang/Object| {
+public open class InnerClassesInGeneric<P, Q> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
index 1b738afef6f..0857abbcc39 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
@@ -1,2 +1,2 @@
-<P> public final class MethodReferencesOuterClassTP : R|java/lang/Object| {
+public final class MethodReferencesOuterClassTP<P> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
index 4331a9f8531..e07006abeb4 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
@@ -1,4 +1,4 @@
-<P> public open class MethodWithTypePRefClassP : R|java/lang/Object| {
+public open class MethodWithTypePRefClassP<P> : R|java/lang/Object| {
     public final operator fun f(): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
index bc64885cc4d..c778c6be5d6 100644
--- a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
@@ -1,2 +1,2 @@
-<T> public abstract interface RawUpperBound : R|java/lang/Object| {
+public abstract interface RawUpperBound<T> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
index fdb86c57fbb..8afcb41fe3d 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
@@ -1,2 +1,2 @@
-<T> public abstract interface RecursiveRawUpperBound : R|java/lang/Object| {
+public abstract interface RecursiveRawUpperBound<T> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
index f922e9ca3dc..ffda7a00d0d 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
@@ -1,2 +1,2 @@
-<T> public abstract interface RecursiveWildcardUpperBound : R|java/lang/Object| {
+public abstract interface RecursiveWildcardUpperBound<T> : R|java/lang/Object| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
index a8eef834a1e..2aaa5ae225f 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
@@ -1,4 +1,4 @@
-<P> public open class JavaBeanVarOfGenericType : R|java/lang/Object| {
+public open class JavaBeanVarOfGenericType<P> : R|java/lang/Object| {
     public open operator fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
 
     public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
index b264659f020..0028d1b5a7f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
@@ -1,4 +1,4 @@
-<T> public open class ConstructorWithNewTypeParams : R|java/lang/Object| {
+public open class ConstructorWithNewTypeParams<T> : R|java/lang/Object| {
     public final fun ConstructorWithNewTypeParams(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
index eaf186a81f3..1fbb631fbc7 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
@@ -1,4 +1,4 @@
-<T> public open class ConstructorWithParentTypeParams : R|java/lang/Object| {
+public open class ConstructorWithParentTypeParams<T> : R|java/lang/Object| {
     public final fun ConstructorWithParentTypeParams(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
index 15a770b2973..284937136f3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
@@ -1,4 +1,4 @@
-<T> public open class PropertyArrayTypes : R|java/lang/Object| {
+public open class PropertyArrayTypes<T> : R|java/lang/Object| {
     public open var arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
         public get(): R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
         public set(value: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|): kotlin/Unit
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
index 47e330e4034..b341a2cb896 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
@@ -1,4 +1,4 @@
-<T> public open class PropertyComplexTypes : R|java/lang/Object| {
+public open class PropertyComplexTypes<T> : R|java/lang/Object| {
     public open var genericType: R|ft<T, T?>|!
         public get(): R|ft<T, T?>|!
         public set(value: R|ft<T, T?>|!): kotlin/Unit
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
index af25d53ba3a..8436830cade 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
@@ -1,4 +1,4 @@
-<E> public abstract interface SubclassOfCollection : R|java/util/Collection<E>| {
+public abstract interface SubclassOfCollection<E> : R|java/util/Collection<E>| {
     public abstract operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E, E?>>, kotlin/collections/Iterator<ft<E, E?>>?>|!
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
index 32253031d13..6a4f69872a5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
@@ -1,4 +1,4 @@
-<K, V> public abstract interface SubclassOfMapEntry : R|java/util/Map.Entry<K, V>| {
+public abstract interface SubclassOfMapEntry<K, V> : R|java/util/Map.Entry<K, V>| {
     public abstract operator fun setValue(value: R|ft<V, V?>|!): R|ft<V, V?>|!
 
     public abstract operator fun setValue(<anonymous Java parameter>: R|ft<V, V?>|!): R|ft<V, V?>|!
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
index f7c6cb7a6bd..463d548524b 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterable : R|java/lang/Object| {
+public abstract interface LoadIterable<T> : R|java/lang/Object| {
     public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
 
     public abstract operator fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
index e7c5d5431e5..3152bbe08cb 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterator : R|java/lang/Object| {
+public abstract interface LoadIterator<T> : R|java/lang/Object| {
     public abstract operator fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!
 
     public abstract operator fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
index 786df58ab8e..643967d9c75 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterable : R|java/lang/Object| {
+public abstract interface LoadIterable<T> : R|java/lang/Object| {
     @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!
 
     public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
index 78d2cf30b9f..b41d691eb09 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterableWithConflict : R|java/lang/Object| {
+public abstract interface LoadIterableWithConflict<T> : R|java/lang/Object| {
     @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
 
     public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
index ae02b854c46..7c50b599441 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface LoadIterableWithNullability : R|java/lang/Object| {
+public abstract interface LoadIterableWithNullability<T> : R|java/lang/Object| {
     @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|
 
     public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
index 44509a03588..ca88ca8e464 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface Comparator : R|java/lang/Object| {
+public abstract interface Comparator<T> : R|java/lang/Object| {
     public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
 
     public abstract operator fun equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
index 0a407ac6af4..1783977f3f4 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
@@ -1,4 +1,4 @@
-<T> public abstract interface GenericInterfaceParameterWithSelfBound : R|java/lang/Object| {
+public abstract interface GenericInterfaceParameterWithSelfBound<T> : R|java/lang/Object| {
     public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
index 716184e051a..be504e44519 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
@@ -1,4 +1,4 @@
-<A, B> public abstract interface GenericInterfaceParametersWithBounds : R|java/lang/Object| {
+public abstract interface GenericInterfaceParametersWithBounds<A, B> : R|java/lang/Object| {
     public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
index fa6d4992071..cb33548a611 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
@@ -1,4 +1,4 @@
-<T> public open class TypeParameterOfClass : R|java/lang/Object| {
+public open class TypeParameterOfClass<T> : R|java/lang/Object| {
     public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
index 286eea9a948..2165ac947fb 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
@@ -1,2 +1,2 @@
-<T> public open class TypeParameterOfOuterClass : R|java/lang/Object| {
+public open class TypeParameterOfOuterClass<T> : R|java/lang/Object| {
 }
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
index f428cfc999c..45eb7731d72 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 class A<T> : R|java/lang/Object| {
     public open operator fun foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
 
 }
diff --git a/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/extraDump.java.txt b/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/extraDump.java.txt
index 3c6143c218c..5f2757c7421 100644
--- a/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/fullWithJavaPredefinedSignature/extraDump.java.txt
@@ -1,2 +1,2 @@
-<T> public abstract interface MyIterable : R|java/lang/Iterable<T>| {
+public abstract interface MyIterable<T> : R|java/lang/Iterable<T>| {
 }
diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/jvm/Strange.txt
index edefa2141a4..8bbfd2a06b2 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 : R|kotlin/Any| {
+    public abstract interface Strange<out T> : R|kotlin/Any| {
         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 666a037caac..33d7e987aa5 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/common/common.txt
@@ -1,5 +1,5 @@
 FILE: common.kt
-    <T> public open expect class A : R|kotlin/Any| {
+    public open expect class A<T> : R|kotlin/Any| {
         public constructor<T>(): R|A<T>| {
             super<R|kotlin/Any|>()
         }
diff --git a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
index 4e670e5d5d3..0819304489a 100644
--- a/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/mppFakeOverrides/jvm/jvm.txt
@@ -1,5 +1,5 @@
 FILE: jvm.kt
-    <T> public open actual class A : R|kotlin/Any| {
+    public open actual class A<T> : R|kotlin/Any| {
         public constructor<T>(): R|A<T>| {
             super<R|kotlin/Any|>()
         }