diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.txt
index f999463f66c..aa56798fe84 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.txt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.txt
@@ -39,5 +39,5 @@ public open class Outer</*0*/ X, /*1*/ Y> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-    public typealias Alias</*0*/ W>  /*captured type parameters: /*1*/ X, /*2*/ Y*/ = kotlin.collections.Map<W, X>
+    public typealias Alias</*0*/ W> /*captured type parameters: /*1*/ X, /*2*/ Y*/ = kotlin.collections.Map<W, X>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.txt
index 0694ed52405..03e32e8a9db 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.txt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.txt
@@ -37,5 +37,5 @@ public open class Outer</*0*/ X, /*1*/ Y> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-    public typealias Alias</*0*/ W>  /*captured type parameters: /*1*/ X, /*2*/ Y*/ = kotlin.collections.Map<W, X>
+    public typealias Alias</*0*/ W> /*captured type parameters: /*1*/ X, /*2*/ Y*/ = kotlin.collections.Map<W, X>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/typeAliasWithSamConstructor.txt b/compiler/testData/diagnostics/tests/j+k/typeAliasWithSamConstructor.txt
index 64f88595466..4d176af6ca5 100644
--- a/compiler/testData/diagnostics/tests/j+k/typeAliasWithSamConstructor.txt
+++ b/compiler/testData/diagnostics/tests/j+k/typeAliasWithSamConstructor.txt
@@ -27,5 +27,5 @@ public interface OnSubscribe</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias ObservableAlias</*0*/ T>  = Observable<T>
+public typealias ObservableAlias</*0*/ T> = Observable<T>
 public typealias ObservableIntAlias = Observable<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
index 201d24b334a..7514fa24a35 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
@@ -104,6 +104,6 @@ public final actual annotation class Foo6 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Foo1 = Bar1
-public typealias Foo4 = Bar2
-public typealias Foo7 = Bar2
+public actual typealias Foo1 = Bar1
+public actual typealias Foo4 = Bar2
+public actual typealias Foo7 = Bar2
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
index 77a7354c0be..6bb6cfa6f0e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
@@ -149,5 +149,5 @@ public open class JavaFoo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Bar3 = JavaBar
-public typealias Foo3 = JavaFoo
+public actual typealias Bar3 = JavaBar
+public actual typealias Foo3 = JavaFoo
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
index e602867ac9f..2477f74033f 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
@@ -36,4 +36,4 @@ public open class JavaBar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Bar = JavaBar
+public actual typealias Bar = JavaBar
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
index 9de137b8c19..56e78558a27 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
@@ -65,14 +65,14 @@ public expect interface C9</*0*/ K> {
 // -- Module: <m2-jvm> --
 package
 
-public typealias C1 = kotlin.String
-public typealias C10</*0*/ L>  = Tmp<L>
-public typealias C2</*0*/ A>  = kotlin.collections.List<kotlin.String>
-public typealias C3</*0*/ B>  = kotlin.collections.List<B>
-public typealias C4</*0*/ D, /*1*/ E>  = kotlin.collections.MutableMap<D, E>
-public typealias C5</*0*/ F, /*1*/ G>  = kotlin.collections.MutableMap<G, F>
-public typealias C6</*0*/ H>  = kotlin.collections.MutableList<H>
-public typealias C7</*0*/ I>  = kotlin.collections.MutableList<out I>
-public typealias C8</*0*/ J>  = kotlin.collections.MutableList<*>
-public typealias C9</*0*/ K>  = kotlin.collections.MutableList<in K>
-public typealias Tmp</*0*/ K>  = kotlin.collections.MutableList<K>
+public actual typealias C1 = kotlin.String
+public actual typealias C10</*0*/ L> = Tmp<L>
+public actual typealias C2</*0*/ A> = kotlin.collections.List<kotlin.String>
+public actual typealias C3</*0*/ B> = kotlin.collections.List<B>
+public actual typealias C4</*0*/ D, /*1*/ E> = kotlin.collections.MutableMap<D, E>
+public actual typealias C5</*0*/ F, /*1*/ G> = kotlin.collections.MutableMap<G, F>
+public actual typealias C6</*0*/ H> = kotlin.collections.MutableList<H>
+public actual typealias C7</*0*/ I> = kotlin.collections.MutableList<out I>
+public actual typealias C8</*0*/ J> = kotlin.collections.MutableList<*>
+public actual typealias C9</*0*/ K> = kotlin.collections.MutableList<in K>
+public typealias Tmp</*0*/ K> = kotlin.collections.MutableList<K>
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
index 60f30369e64..4781dc02f78 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
@@ -24,4 +24,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Foo = FooImpl
+public actual typealias Foo = FooImpl
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
index d83c6f06e8e..8f4bf9cd27c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
@@ -19,4 +19,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Foo = FooImpl
+public actual typealias Foo = FooImpl
diff --git a/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt b/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
index c122ac4cd3e..9316035da15 100644
--- a/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
+++ b/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
@@ -5,7 +5,7 @@ public final class C {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public typealias SF</*0*/ T>  = (T) -> kotlin.String
+    public typealias SF</*0*/ T> = (T) -> kotlin.String
     public typealias SS = kotlin.String
 }
 public typealias S = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
index ea7a0ff901f..05153040d52 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
@@ -21,7 +21,7 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias N</*0*/ T>  = Num<T>
-public typealias N2</*0*/ T>  = N<T>
-public typealias TC</*0*/ T, /*1*/ C>  = TColl<T, C>
-public typealias TC2</*0*/ T, /*1*/ C>  = TC<T, C>
+public typealias N</*0*/ T> = Num<T>
+public typealias N2</*0*/ T> = N<T>
+public typealias TC</*0*/ T, /*1*/ C> = TColl<T, C>
+public typealias TC2</*0*/ T, /*1*/ C> = TC<T, C>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
index 7f1fa33dd5e..58abf105b9e 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
@@ -15,5 +15,5 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
-public typealias TC2</*0*/ T1, /*1*/ T2>  = TC<T1, T2>
+public typealias TC</*0*/ T1, /*1*/ T2> = TColl<T1, T2>
+public typealias TC2</*0*/ T1, /*1*/ T2> = TC<T1, T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
index 7d49b1217c2..1c3143a1a67 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
@@ -37,6 +37,6 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias NA</*0*/ T>  = Num<T>
-public typealias NL</*0*/ T>  = NumColl<kotlin.collections.List<T>>
-public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
+public typealias NA</*0*/ T> = Num<T>
+public typealias NL</*0*/ T> = NumColl<kotlin.collections.List<T>>
+public typealias TC</*0*/ T1, /*1*/ T2> = TColl<T1, T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
index 77eeb0196fe..3624d14451d 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
@@ -6,11 +6,11 @@ public final class TC</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias TCAlias</*0*/ T, /*1*/ C>  = TC<T, C>
-public typealias TCAliasC</*0*/ C>  = TC<kotlin.Any, C>
-public typealias TCAliasC1</*0*/ C>  = TCAlias<kotlin.Any, C>
-public typealias TCAliasT</*0*/ T>  = TC<T, kotlin.Any>
-public typealias TCAliasT1</*0*/ T>  = TCAlias<T, kotlin.Any>
+public typealias TCAlias</*0*/ T, /*1*/ C> = TC<T, C>
+public typealias TCAliasC</*0*/ C> = TC<kotlin.Any, C>
+public typealias TCAliasC1</*0*/ C> = TCAlias<kotlin.Any, C>
+public typealias TCAliasT</*0*/ T> = TC<T, kotlin.Any>
+public typealias TCAliasT1</*0*/ T> = TCAlias<T, kotlin.Any>
 public typealias Test1 = TC<kotlin.Any, kotlin.Any>
 public typealias Test10 = TCAliasC1<kotlin.collections.Collection<kotlin.Any>>
 public typealias Test2 = TC<kotlin.Any, kotlin.collections.Collection<kotlin.Any>>
diff --git a/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt b/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
index cacfebe8857..0a97f82ae18 100644
--- a/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
+++ b/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
@@ -14,9 +14,9 @@ public interface Out</*0*/ out T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias InAlias</*0*/ T>  = In<T>
-public typealias OutAlias</*0*/ T>  = Out<T>
-public typealias TestInForOut</*0*/ T>  = Out<in T>
-public typealias TestInForOutWithinAlias</*0*/ T>  = OutAlias<in T>
-public typealias TestOutForIn</*0*/ T>  = In<out T>
-public typealias TestOutForInWithinAlias</*0*/ T>  = InAlias<out T>
+public typealias InAlias</*0*/ T> = In<T>
+public typealias OutAlias</*0*/ T> = Out<T>
+public typealias TestInForOut</*0*/ T> = Out<in T>
+public typealias TestInForOutWithinAlias</*0*/ T> = OutAlias<in T>
+public typealias TestOutForIn</*0*/ T> = In<out T>
+public typealias TestOutForInWithinAlias</*0*/ T> = InAlias<out T>
diff --git a/compiler/testData/diagnostics/tests/typealias/cyclicInheritanceViaTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/cyclicInheritanceViaTypeAlias.txt
index e004c471509..a2d7b2001f3 100644
--- a/compiler/testData/diagnostics/tests/typealias/cyclicInheritanceViaTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/cyclicInheritanceViaTypeAlias.txt
@@ -14,4 +14,4 @@ public final class A {
 public open class B {
     public constructor B()
 }
-public typealias ANested</*0*/ T>  = A.Nested<T>
+public typealias ANested</*0*/ T> = A.Nested<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.kt b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.kt
index 95b74061881..16215b33aea 100644
--- a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.kt
+++ b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.kt
@@ -20,7 +20,7 @@ class Outer {
     private typealias TestProtected4 = Protected
     typealias <!EXPOSED_TYPEALIAS_EXPANDED_TYPE!>TestProtected5<!> = L<Protected>
     typealias <!EXPOSED_TYPEALIAS_EXPANDED_TYPE!>TestProtected6<!> = L<TestProtected1>
-    
+
     typealias <!EXPOSED_TYPEALIAS_EXPANDED_TYPE!>TestInternal1<!> = Internal
     protected typealias <!EXPOSED_TYPEALIAS_EXPANDED_TYPE!>TestInternal2<!> = Internal
     internal typealias TestInternal3 = Internal
diff --git a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
index 2d7318a19a7..377e9101667 100644
--- a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
+++ b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
@@ -59,7 +59,7 @@ private final class Private {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias L</*0*/ T>  = kotlin.collections.List<T>
+public typealias L</*0*/ T> = kotlin.collections.List<T>
 public typealias TestInternal1 = Internal
 internal typealias TestInternal2 = Internal
 private typealias TestInternal3 = Internal
diff --git a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
index bec1b6a3fbd..7d8c58d6369 100644
--- a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
@@ -14,4 +14,4 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias GTC</*0*/ T>  = C<T>
+public typealias GTC</*0*/ T> = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
index 81c49beea6e..44f8331f660 100644
--- a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
+++ b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
@@ -33,5 +33,5 @@ public final class GenericClassWithCompanion</*0*/ T> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-public typealias GenericTestObject</*0*/ T>  = AnObject
-public typealias TestGCWC</*0*/ T>  = GenericClassWithCompanion<T>
+public typealias GenericTestObject</*0*/ T> = AnObject
+public typealias TestGCWC</*0*/ T> = GenericClassWithCompanion<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/illegalTypeInTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/illegalTypeInTypeAliasExpansion.txt
index fe979c28db3..acb713edcdc 100644
--- a/compiler/testData/diagnostics/tests/typealias/illegalTypeInTypeAliasExpansion.txt
+++ b/compiler/testData/diagnostics/tests/typealias/illegalTypeInTypeAliasExpansion.txt
@@ -1,10 +1,10 @@
 package
 
-public typealias A</*0*/ T>  = kotlin.Array<T>
-public typealias AA</*0*/ T>  = A<A<T>>
+public typealias A</*0*/ T> = kotlin.Array<T>
+public typealias AA</*0*/ T> = A<A<T>>
 public typealias AAN = AA<kotlin.Nothing>
 public typealias AAN2 = A<A<kotlin.Nothing>>
 public typealias AN = A<kotlin.Nothing>
-public typealias First</*0*/ X, /*1*/ Y>  = kotlin.collections.List<X>
+public typealias First</*0*/ X, /*1*/ Y> = kotlin.collections.List<X>
 public typealias UnusedAN1 = First<kotlin.Int, kotlin.Array<kotlin.Nothing>>
 public typealias UnusedAN2 = First<kotlin.Int, A<kotlin.Nothing>>
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.txt
index 83ec38967f1..b62f74a0c7a 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.txt
@@ -34,6 +34,6 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-public typealias GI</*0*/ T>  = Generic<T>.Inner
+public typealias GI</*0*/ T> = Generic<T>.Inner
 public typealias GIntI = Generic<kotlin.Int>.Inner
 public typealias OI = Outer.Inner
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.txt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.txt
index dd6281ff064..870784b1023 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.txt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.txt
@@ -127,11 +127,11 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
-    public typealias GG</*0*/ T1, /*1*/ T2>  = test.Generic<T1>.Generic<T2>
-    public typealias GGInt</*0*/ T1>  = test.Generic<T1>.Generic<kotlin.Int>
-    public typealias GI</*0*/ T>  = test.Generic<T>.Inner
+    public typealias GG</*0*/ T1, /*1*/ T2> = test.Generic<T1>.Generic<T2>
+    public typealias GGInt</*0*/ T1> = test.Generic<T1>.Generic<kotlin.Int>
+    public typealias GI</*0*/ T> = test.Generic<T>.Inner
     public typealias GIInt = test.Generic<kotlin.Int>.Inner
     public typealias GIStar = test.Generic<*>.Inner
-    public typealias GIntG</*0*/ T2>  = test.Generic<kotlin.Int>.Generic<T2>
+    public typealias GIntG</*0*/ T2> = test.Generic<kotlin.Int>.Generic<T2>
     public typealias OI = test.Outer.Inner
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt
index c7245958edc..281ff743b6e 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt
@@ -54,8 +54,8 @@ public final class Outer</*0*/ T> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-    public typealias GenericInnerAlias</*0*/ TT>  /*captured type parameters: /*1*/ T*/ = Outer<T>.GenericInner<TT>
-    public typealias GenericNestedAlias</*0*/ TT>  = Outer.GenericNested<TT>
+    public typealias GenericInnerAlias</*0*/ TT> /*captured type parameters: /*1*/ T*/ = Outer<T>.GenericInner<TT>
+    public typealias GenericNestedAlias</*0*/ TT> = Outer.GenericNested<TT>
     public typealias InnerAlias /*captured type parameters: /*0*/ T*/ = Outer<T>.Inner
     public typealias NestedAlias = Outer.Nested
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt
index b007fd8321a..380d19ffdff 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt
@@ -15,8 +15,8 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public typealias P /*captured type parameters: /*0*/ T*/ = Pair<T, T>
-    public typealias P1</*0*/ X>  /*captured type parameters: /*1*/ T*/ = Pair<X, T>
-    public typealias P2</*0*/ Y>  /*captured type parameters: /*1*/ T*/ = Pair<T, Y>
+    public typealias P1</*0*/ X> /*captured type parameters: /*1*/ T*/ = Pair<X, T>
+    public typealias P2</*0*/ Y> /*captured type parameters: /*1*/ T*/ = Pair<T, Y>
 }
 
 public final class Pair</*0*/ X, /*1*/ Y> {
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14498.txt b/compiler/testData/diagnostics/tests/typealias/kt14498.txt
index de026cd17a1..85e92a5e85f 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt14498.txt
+++ b/compiler/testData/diagnostics/tests/typealias/kt14498.txt
@@ -52,8 +52,8 @@ public final class Test5</*0*/ out S> : AInvOutTT<S> /* = InvOut<S, S> */ {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias A1</*0*/ S>  = I1<S>
-public typealias A2</*0*/ T, /*1*/ S>  = I1<S>
-public typealias AInvOut</*0*/ T1, /*1*/ T2>  = InvOut<T1, T2>
-public typealias AInvOutTT</*0*/ T>  = AInvOut<T, T>
-public typealias AOut</*0*/ T>  = Out<T>
+public typealias A1</*0*/ S> = I1<S>
+public typealias A2</*0*/ T, /*1*/ S> = I1<S>
+public typealias AInvOut</*0*/ T1, /*1*/ T2> = InvOut<T1, T2>
+public typealias AInvOutTT</*0*/ T> = AInvOut<T, T>
+public typealias AOut</*0*/ T> = Out<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14498a.txt b/compiler/testData/diagnostics/tests/typealias/kt14498a.txt
index f6afb359612..435cb3a38e7 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt14498a.txt
+++ b/compiler/testData/diagnostics/tests/typealias/kt14498a.txt
@@ -35,7 +35,7 @@ public interface Q4</*0*/ out S> : Out<A4<S> /* = Out<Inv<S>> */> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias A1</*0*/ E>  = Out<Out<E>>
-public typealias A2</*0*/ E>  = Out<Out<E>>
-public typealias A3</*0*/ E>  = Inv<Out<E>>
-public typealias A4</*0*/ E>  = Out<Inv<E>>
+public typealias A1</*0*/ E> = Out<Out<E>>
+public typealias A2</*0*/ E> = Out<Out<E>>
+public typealias A3</*0*/ E> = Inv<Out<E>>
+public typealias A4</*0*/ E> = Out<Inv<E>>
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14518.txt b/compiler/testData/diagnostics/tests/typealias/kt14518.txt
index d3fa98db44c..62250182560 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt14518.txt
+++ b/compiler/testData/diagnostics/tests/typealias/kt14518.txt
@@ -12,8 +12,8 @@ public final class OuterClass</*0*/ T1> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-    public typealias NestedType</*0*/ T>  = OuterClass.NestedClass<T>
+    public typealias NestedType</*0*/ T> = OuterClass.NestedClass<T>
 }
-public typealias ON1</*0*/ T1, /*1*/ T2>  = [ERROR : NestedClass]<T1, T2>
-public typealias ON2</*0*/ T1, /*1*/ T2>  = [ERROR : NestedType]<T1, T2>
-public typealias ON3</*0*/ T2>  = OuterClass.NestedType<T2>
+public typealias ON1</*0*/ T1, /*1*/ T2> = [ERROR : NestedClass]<T1, T2>
+public typealias ON2</*0*/ T1, /*1*/ T2> = [ERROR : NestedType]<T1, T2>
+public typealias ON3</*0*/ T2> = OuterClass.NestedType<T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/kt19601.txt b/compiler/testData/diagnostics/tests/typealias/kt19601.txt
index 46f3e11cfdd..28d443c1cd7 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt19601.txt
+++ b/compiler/testData/diagnostics/tests/typealias/kt19601.txt
@@ -25,5 +25,5 @@ public final class Test2</*0*/ T : N<kotlin.String> /* = Num<kotlin.String> */>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias N</*0*/ T>  = Num<T>
-public typealias Ord</*0*/ T>  = Order<T>
+public typealias N</*0*/ T> = Num<T>
+public typealias Ord</*0*/ T> = Order<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt b/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
index 89e94bd767f..a42dad7735f 100644
--- a/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
+++ b/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
@@ -17,7 +17,7 @@ public final class C</*0*/ T> {
     public final fun </*0*/ T2> second2(/*0*/ p: C<T>.PT2<T2> /* = Pair<T, T2> */): T2
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public typealias P2 /*captured type parameters: /*0*/ T*/ = Pair<T, T>
-    public typealias PT2</*0*/ T2>  /*captured type parameters: /*1*/ T*/ = Pair<T, T2>
+    public typealias PT2</*0*/ T2> /*captured type parameters: /*1*/ T*/ = Pair<T, T2>
 }
 
 public final class Pair</*0*/ T1, /*1*/ T2> {
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
index 261ee50bd38..b2d505c51c6 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
@@ -4,5 +4,5 @@ public fun bar1(/*0*/ a: Array2D<kotlin.Int> /* = kotlin.Array<kotlin.Array<kotl
 public fun bar2(/*0*/ m: TMap<*> /* = kotlin.collections.Map<*, *> */): [ERROR : Error function type]
 public fun foo1(/*0*/ a: Array2D<out kotlin.Number> /* = kotlin.Array<kotlin.Array<out kotlin.Number>> */): Array2D<out kotlin.Number> /* = kotlin.Array<kotlin.Array<out kotlin.Number>> */
 public fun </*0*/ T> foo2(/*0*/ m: TMap<T> /* = kotlin.collections.Map<T, T> */): TMap<T> /* = kotlin.collections.Map<T, T> */
-public typealias Array2D</*0*/ T>  = kotlin.Array<kotlin.Array<T>>
-public typealias TMap</*0*/ T>  = kotlin.collections.Map<T, T>
+public typealias Array2D</*0*/ T> = kotlin.Array<kotlin.Array<T>>
+public typealias TMap</*0*/ T> = kotlin.collections.Map<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
index a9fe458bc1b..400c3cd68a8 100644
--- a/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
+++ b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
@@ -1,7 +1,7 @@
 package
 
 public val x: WithVariance<kotlin.Int, kotlin.Int> /* = kotlin.Int */ = 0
-public typealias WithBounds1</*0*/ T : [ERROR : Cyclic upper bounds]>  = kotlin.Int
-public typealias WithBounds2</*0*/ X : [ERROR : Cyclic upper bounds], /*1*/ Y : [ERROR : Cyclic upper bounds]>  = kotlin.Int
-public typealias WithBounds3</*0*/ X>  = kotlin.Int
-public typealias WithVariance</*0*/ in X, /*1*/ out Y>  = kotlin.Int
+public typealias WithBounds1</*0*/ T : [ERROR : Cyclic upper bounds]> = kotlin.Int
+public typealias WithBounds2</*0*/ X : [ERROR : Cyclic upper bounds], /*1*/ Y : [ERROR : Cyclic upper bounds]> = kotlin.Int
+public typealias WithBounds3</*0*/ X> = kotlin.Int
+public typealias WithVariance</*0*/ in X, /*1*/ out Y> = kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt b/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
index 277dae7348c..98e5f89bdb3 100644
--- a/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
+++ b/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
@@ -11,4 +11,4 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias CA</*0*/ T>  = C<T>
+public typealias CA</*0*/ T> = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
index 7f86005af46..b790f5c90e1 100644
--- a/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
@@ -10,4 +10,4 @@ public final class In</*0*/ in T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias InAlias</*0*/ T>  = In<T>
+public typealias InAlias</*0*/ T> = In<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjection.txt b/compiler/testData/diagnostics/tests/typealias/starProjection.txt
index e597bae9e8a..4e2043cb67c 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjection.txt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjection.txt
@@ -6,5 +6,5 @@ public fun test2(/*0*/ x: kotlin.collections.Map<kotlin.String, kotlin.Int>): B
 public fun test3(/*0*/ x: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Int
 public fun test4(/*0*/ x: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Any?
 public fun test5(/*0*/ x: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Any?
-public typealias A</*0*/ T>  = kotlin.collections.Map<T, T>
+public typealias A</*0*/ T> = kotlin.collections.Map<T, T>
 public typealias B = A<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt b/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
index d04ef498688..81513e01c03 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
@@ -11,4 +11,4 @@ public final class NumCharSeq</*0*/ N : kotlin.Number, /*1*/ M : kotlin.CharSequ
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Test</*0*/ X, /*1*/ Y>  = NumCharSeq<X, Y>
+public typealias Test</*0*/ X, /*1*/ Y> = NumCharSeq<X, Y>
diff --git a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
index c03bf29c425..785d5b4501f 100644
--- a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
+++ b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
@@ -58,15 +58,15 @@ public final class Out</*0*/ out T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias In1</*0*/ T>  = In<T>
-public typealias In2</*0*/ T>  = In<in T>
-public typealias In3</*0*/ T>  = In<out T>
-public typealias In4</*0*/ T>  = In<*>
-public typealias Inv1</*0*/ T>  = Inv<T>
-public typealias Inv2</*0*/ T>  = Inv<in T>
-public typealias Inv3</*0*/ T>  = Inv<out T>
-public typealias Inv4</*0*/ T>  = Inv<*>
-public typealias Out1</*0*/ T>  = Out<T>
-public typealias Out2</*0*/ T>  = Out<in T>
-public typealias Out3</*0*/ T>  = Out<out T>
-public typealias Out4</*0*/ T>  = Out<*>
+public typealias In1</*0*/ T> = In<T>
+public typealias In2</*0*/ T> = In<in T>
+public typealias In3</*0*/ T> = In<out T>
+public typealias In4</*0*/ T> = In<*>
+public typealias Inv1</*0*/ T> = Inv<T>
+public typealias Inv2</*0*/ T> = Inv<in T>
+public typealias Inv3</*0*/ T> = Inv<out T>
+public typealias Inv4</*0*/ T> = Inv<*>
+public typealias Out1</*0*/ T> = Out<T>
+public typealias Out2</*0*/ T> = Out<in T>
+public typealias Out3</*0*/ T> = Out<out T>
+public typealias Out4</*0*/ T> = Out<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
index 63478a2e346..5aeb9ce72e3 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
@@ -17,4 +17,4 @@ public final class C</*0*/ T1, /*1*/ T2> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-public typealias C2</*0*/ T>  = C<T, T>
+public typealias C2</*0*/ T> = C<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
index 2370e60130e..d5cefedd344 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
@@ -15,4 +15,4 @@ public final class Pair</*0*/ T1, /*1*/ T2> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias P2</*0*/ T>  = Pair<T, T>
+public typealias P2</*0*/ T> = Pair<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasAsBareType.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasAsBareType.txt
index 03e0005f515..a0292b59e38 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasAsBareType.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasAsBareType.txt
@@ -14,11 +14,11 @@ public fun testWrong1(/*0*/ x: kotlin.collections.Map<kotlin.Any, kotlin.Any>):
 public fun testWrong2(/*0*/ x: kotlin.collections.Map<kotlin.Any, kotlin.Any>): kotlin.Boolean
 public fun testWrong3(/*0*/ x: kotlin.collections.Map<kotlin.Any, kotlin.Any>): kotlin.Boolean
 public fun testWrong4(/*0*/ x: kotlin.collections.List<kotlin.Any>): kotlin.Boolean
-public typealias Dictionary</*0*/ T>  = kotlin.collections.MutableMap<kotlin.String, T>
-public typealias L</*0*/ T>  = kotlin.collections.List<T>
-public typealias LStar</*0*/ T>  = kotlin.collections.List<*>
-public typealias MMTT</*0*/ T>  = kotlin.collections.MutableMap<T, T>
-public typealias MyList</*0*/ T, /*1*/ X>  = kotlin.collections.List<X>
-public typealias NL</*0*/ T>  = kotlin.collections.List<T>?
-public typealias ReadableList</*0*/ T>  = kotlin.collections.MutableList<out T>
-public typealias WriteableMap</*0*/ K, /*1*/ V>  = kotlin.collections.MutableMap<in K, V>
+public typealias Dictionary</*0*/ T> = kotlin.collections.MutableMap<kotlin.String, T>
+public typealias L</*0*/ T> = kotlin.collections.List<T>
+public typealias LStar</*0*/ T> = kotlin.collections.List<*>
+public typealias MMTT</*0*/ T> = kotlin.collections.MutableMap<T, T>
+public typealias MyList</*0*/ T, /*1*/ X> = kotlin.collections.List<X>
+public typealias NL</*0*/ T> = kotlin.collections.List<T>?
+public typealias ReadableList</*0*/ T> = kotlin.collections.MutableList<out T>
+public typealias WriteableMap</*0*/ K, /*1*/ V> = kotlin.collections.MutableMap<in K, V>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.txt
index f87cefb1876..40cd6fcbf4b 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.txt
@@ -43,5 +43,5 @@ public final class Unrelated {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public typealias B = Base
-public typealias GB</*0*/ T>  = GenericBase<T>
+public typealias GB</*0*/ T> = GenericBase<T>
 public typealias U = Unrelated
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt
index a9e06910eaf..07f8031809d 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.txt
@@ -12,6 +12,6 @@ public final class Bound</*0*/ X, /*1*/ Y : X> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias B</*0*/ X, /*1*/ Y>  = Bound<X, Y>
-public typealias BInIn</*0*/ T>  = Bound<in kotlin.collections.List<T>, in T>
-public typealias BOutIn</*0*/ T>  = Bound<out kotlin.collections.List<T>, in T>
+public typealias B</*0*/ X, /*1*/ Y> = Bound<X, Y>
+public typealias BInIn</*0*/ T> = Bound<in kotlin.collections.List<T>, in T>
+public typealias BOutIn</*0*/ T> = Bound<out kotlin.collections.List<T>, in T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.txt
index e65d538ffe6..24a50083f72 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.txt
@@ -15,4 +15,4 @@ public final class C</*0*/ T> {
 public typealias CIn = C<in kotlin.Int>
 public typealias COut = C<out kotlin.Int>
 public typealias CStar = C<*>
-public typealias CT</*0*/ T>  = C<T>
+public typealias CT</*0*/ T> = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.txt
index 92b361b0ac8..ff158779ad0 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.txt
@@ -44,4 +44,4 @@ public final class Test5 : CT<*> /* = C<*> */ {
 public typealias CIn = C<in kotlin.Int>
 public typealias COut = C<out kotlin.Int>
 public typealias CStar = C<*>
-public typealias CT</*0*/ T>  = C<T>
+public typealias CT</*0*/ T> = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.txt
index ba7a3f6310f..5b270cdc78b 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.txt
@@ -22,4 +22,4 @@ public final class Test2 : R<kotlin.Int> /* = Ref<kotlin.Int> */ {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias R</*0*/ T>  = Ref<T>
+public typealias R</*0*/ T> = Ref<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorReturnType.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorReturnType.txt
index 3169647e793..2733bda2aef 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorReturnType.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorReturnType.txt
@@ -25,8 +25,8 @@ public final class Pair</*0*/ T1, /*1*/ T2> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias CA</*0*/ TA>  = Cell<TA>
+public typealias CA</*0*/ TA> = Cell<TA>
 public typealias CIntA = Cell<kotlin.Int>
-public typealias P2A</*0*/ TA>  = Pair<TA, TA>
-public typealias PA</*0*/ T1A, /*1*/ T2A>  = Pair<T1A, T2A>
+public typealias P2A</*0*/ TA> = Pair<TA, TA>
+public typealias PA</*0*/ T1A, /*1*/ T2A> = Pair<T1A, T2A>
 public typealias PIntIntA = Pair<kotlin.Int, kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.txt
index 7d86a477a50..ba717ec22b2 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.txt
@@ -44,9 +44,9 @@ public final class Pair</*0*/ X, /*1*/ Y> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias C</*0*/ T>  = Cons<T>
-public typealias CC</*0*/ T>  = C<C<T>>
-public typealias F</*0*/ T>  = Foo<T>
-public typealias N</*0*/ T>  = Num<T>
-public typealias PL</*0*/ T>  = Pair<T, kotlin.collections.List<T>>
-public typealias PN</*0*/ T>  = Pair<T, Num<T>>
+public typealias C</*0*/ T> = Cons<T>
+public typealias CC</*0*/ T> = C<C<T>>
+public typealias F</*0*/ T> = Foo<T>
+public typealias N</*0*/ T> = Num<T>
+public typealias PL</*0*/ T> = Pair<T, kotlin.collections.List<T>>
+public typealias PN</*0*/ T> = Pair<T, Num<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.txt
index e34d3c6a445..10d357efcdc 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.txt
@@ -11,4 +11,4 @@ public final class Cons</*0*/ T : kotlin.Number> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias C</*0*/ T>  = Cons<T>
+public typealias C</*0*/ T> = Cons<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.txt
index 92486783d17..8123aa2c195 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.txt
@@ -25,4 +25,4 @@ public interface Ref</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias LateNR</*0*/ Nt>  = LateInitNumRef<Nt>
+public typealias LateNR</*0*/ Nt> = LateInitNumRef<Nt>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.txt
index 9222d32b54d..21525a1dda9 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.txt
@@ -26,5 +26,5 @@ public final class Hr</*0*/ A, /*1*/ B, /*2*/ C, /*3*/ D> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Bas</*0*/ T>  = Hr<T, T, Foo<T>, Bar<T>>
-public typealias Test</*0*/ A, /*1*/ B>  = Hr<A, B, Foo<A>, Bar<B>>
+public typealias Bas</*0*/ T> = Hr<T, T, Foo<T>, Bar<T>>
+public typealias Test</*0*/ A, /*1*/ B> = Hr<A, B, Foo<A>, Bar<B>>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasForProjectionInSuperInterfaces.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasForProjectionInSuperInterfaces.txt
index fdcb305aaa5..c4d7df1ea8e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasForProjectionInSuperInterfaces.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasForProjectionInSuperInterfaces.txt
@@ -110,11 +110,11 @@ public final class Test9 : OutT<out kotlin.Int> /* = Out<out kotlin.Int> */ {
 }
 public typealias InIn = In<in kotlin.Int>
 public typealias InStar = In<*>
-public typealias InT</*0*/ T>  = In<T>
+public typealias InT</*0*/ T> = In<T>
 public typealias InvIn = Inv<in kotlin.Int>
 public typealias InvOut = Inv<out kotlin.Int>
 public typealias InvStar = Inv<*>
-public typealias InvT</*0*/ T>  = Inv<T>
+public typealias InvT</*0*/ T> = Inv<T>
 public typealias OutOut = Out<out kotlin.Int>
 public typealias OutStar = Out<*>
-public typealias OutT</*0*/ T>  = Out<T>
+public typealias OutT</*0*/ T> = Out<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
index 7993158b21f..9d9b35f6810 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
@@ -5,14 +5,14 @@ public final class Outer {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public typealias ToTypeParam1</*0*/ T>  = T
-    public typealias ToTypeParam2</*0*/ T>  = Outer.ToTypeParam1<T>
-    public typealias ToTypeParam3</*0*/ T1, /*1*/ T2>  = Outer.ToTypeParam2<T1>
+    public typealias ToTypeParam1</*0*/ T> = T
+    public typealias ToTypeParam2</*0*/ T> = Outer.ToTypeParam1<T>
+    public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = Outer.ToTypeParam2<T1>
     public typealias ToTypeParam4 = Outer.ToTypeParam1<kotlin.Any>
 }
 public typealias ToFun1 = () -> kotlin.Unit
-public typealias ToFun2</*0*/ T>  = (T) -> kotlin.Unit
-public typealias ToTypeParam1</*0*/ T>  = T
-public typealias ToTypeParam2</*0*/ T>  = ToTypeParam1<T>
-public typealias ToTypeParam3</*0*/ T1, /*1*/ T2>  = ToTypeParam2<T1>
+public typealias ToFun2</*0*/ T> = (T) -> kotlin.Unit
+public typealias ToTypeParam1</*0*/ T> = T
+public typealias ToTypeParam2</*0*/ T> = ToTypeParam1<T>
+public typealias ToTypeParam3</*0*/ T1, /*1*/ T2> = ToTypeParam2<T1>
 public typealias ToTypeParam4 = ToTypeParam1<kotlin.Any>
diff --git a/compiler/testData/diagnostics/tests/typealias/typealiasRhsAnnotationsInArguments.txt b/compiler/testData/diagnostics/tests/typealias/typealiasRhsAnnotationsInArguments.txt
index 3082f907706..9abf29ff56a 100644
--- a/compiler/testData/diagnostics/tests/typealias/typealiasRhsAnnotationsInArguments.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typealiasRhsAnnotationsInArguments.txt
@@ -22,4 +22,4 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias CA</*0*/ T>  = C<@Ann1 T>
+public typealias CA</*0*/ T> = C<@Ann1 T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typealiasRhsRepeatedAnnotationInArguments.txt b/compiler/testData/diagnostics/tests/typealias/typealiasRhsRepeatedAnnotationInArguments.txt
index 1aebe4afa3c..33597ee7730 100644
--- a/compiler/testData/diagnostics/tests/typealias/typealiasRhsRepeatedAnnotationInArguments.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typealiasRhsRepeatedAnnotationInArguments.txt
@@ -6,5 +6,5 @@ package
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Gen</*0*/ T>  = kotlin.collections.List<@A T>
+public typealias Gen</*0*/ T> = kotlin.collections.List<@A T>
 public typealias Test1 = Gen<@A kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
index caf6dd40f3e..a2a4d5f8f48 100644
--- a/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
@@ -17,6 +17,6 @@ public final class Test3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public typealias CA = [ERROR : CA]
-public typealias L</*0*/ T>  = [ERROR : L]
+public typealias L</*0*/ T> = [ERROR : L]
 public typealias S = [ERROR : S]
 public typealias Unused = [ERROR : Unused]
diff --git a/compiler/testData/diagnostics/tests/typealias/unusedTypeAliasParameter.txt b/compiler/testData/diagnostics/tests/typealias/unusedTypeAliasParameter.txt
index c329e92805f..d8e236c31fb 100644
--- a/compiler/testData/diagnostics/tests/typealias/unusedTypeAliasParameter.txt
+++ b/compiler/testData/diagnostics/tests/typealias/unusedTypeAliasParameter.txt
@@ -1,4 +1,4 @@
 package
 
-public typealias Test</*0*/ T, /*1*/ X>  = kotlin.collections.List<T>
-public typealias Test2</*0*/ T, /*1*/ X>  = Test<T, X>
+public typealias Test</*0*/ T, /*1*/ X> = kotlin.collections.List<T>
+public typealias Test2</*0*/ T, /*1*/ X> = Test<T, X>
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
index 991cf163f01..5b150ff48b9 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
@@ -35,7 +35,7 @@ public final class Pair</*0*/ T1, /*1*/ T2> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias N</*0*/ T>  = Num<T>
-public typealias P</*0*/ T1, /*1*/ T2>  = Pair<T1, T2>
-public typealias P2</*0*/ T>  = Pair<T, T>
-public typealias PR</*0*/ T1, /*1*/ T2>  = Pair<T2, T1>
+public typealias N</*0*/ T> = Num<T>
+public typealias P</*0*/ T1, /*1*/ T2> = Pair<T1, T2>
+public typealias P2</*0*/ T> = Pair<T, T>
+public typealias PR</*0*/ T1, /*1*/ T2> = Pair<T2, T1>
diff --git a/compiler/testData/diagnostics/tests/variance/ea1337846.txt b/compiler/testData/diagnostics/tests/variance/ea1337846.txt
index d9955784989..fc4323da719 100644
--- a/compiler/testData/diagnostics/tests/variance/ea1337846.txt
+++ b/compiler/testData/diagnostics/tests/variance/ea1337846.txt
@@ -6,4 +6,4 @@ public interface ComputablePath</*0*/ NumberType : kotlin.Number, /*1*/ PointTyp
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias EachSegmentComparator</*0*/ SegmentType>  = (currentSegment: SegmentType, otherSegment: SegmentType, relationship: kotlin.Int) -> kotlin.Boolean
+public typealias EachSegmentComparator</*0*/ SegmentType> = (currentSegment: SegmentType, otherSegment: SegmentType, relationship: kotlin.Int) -> kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt
index f1cd7cb37b8..45e6ed560ae 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt
@@ -4,4 +4,4 @@ public typealias Dyn = [ERROR : dynamic type in wrong context]
 public typealias Dyn2 = Dyn
 public typealias Dyn3 = Dyn2
 public typealias Dyn4 = Type<Dyn>
-public typealias Type</*0*/ T>  = T
+public typealias Type</*0*/ T> = T
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithAnnotatedDynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithAnnotatedDynamic.txt
index 27e5c76466a..59027359740 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithAnnotatedDynamic.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithAnnotatedDynamic.txt
@@ -18,7 +18,7 @@ public fun useAnnGen2(/*0*/ x: TestAnnGen2 /* = kotlin.collections.List<dynamic>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias AnnGenList</*0*/ T>  = kotlin.collections.List<@Ann1 T>
+public typealias AnnGenList</*0*/ T> = kotlin.collections.List<@Ann1 T>
 public typealias TestAnnGen1 = AnnGenList<dynamic>
 public typealias TestAnnGen2 = AnnGenList<dynamic>
 public typealias TestAnnGen3 = AnnGenList<dynamic>
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithDynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithDynamic.txt
index b191d601dc8..0194fdf4930 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithDynamic.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithDynamic.txt
@@ -4,7 +4,7 @@ public fun testUseGen1(/*0*/ x: kotlin.collections.List<dynamic>): TestGen1 /* =
 public fun testUseGen2(/*0*/ x: kotlin.collections.List<kotlin.collections.List<dynamic>>): TestGen2 /* = kotlin.collections.List<kotlin.collections.List<dynamic>> */
 public fun useGen1(/*0*/ x: TestGen1 /* = kotlin.collections.List<dynamic> */): TestGen1 /* = kotlin.collections.List<dynamic> */
 public fun useGen2(/*0*/ x: TestGen2 /* = kotlin.collections.List<kotlin.collections.List<dynamic>> */): TestGen2 /* = kotlin.collections.List<kotlin.collections.List<dynamic>> */
-public typealias GenList</*0*/ T>  = kotlin.collections.List<T>
+public typealias GenList</*0*/ T> = kotlin.collections.List<T>
 public typealias Test1 = kotlin.collections.List<dynamic>
 public typealias Test2 = (dynamic) -> dynamic
 public typealias TestGen1 = GenList<dynamic>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/hashMapTypeAlias.txt b/compiler/testData/diagnostics/testsWithStdLib/typealias/hashMapTypeAlias.txt
index dd18182c972..9ab7a5d6e03 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/typealias/hashMapTypeAlias.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/hashMapTypeAlias.txt
@@ -6,4 +6,4 @@ public val nameToTeam: kotlin.collections.List<kotlin.Pair<kotlin.String, kotlin
 public val namesByTeam: kotlin.collections.Map<kotlin.String, kotlin.collections.List<kotlin.String>>
 public fun test(): kotlin.Unit
 public fun </*0*/ K, /*1*/ V, /*2*/ M : kotlin.collections.MutableMap<in K, kotlin.collections.MutableList<V>>> updateMap(/*0*/ map: M, /*1*/ k: K, /*2*/ v: V): M
-public typealias HM</*0*/ Kt, /*1*/ Vt>  = java.util.HashMap<Kt, Vt>
+public typealias HM</*0*/ Kt, /*1*/ Vt> = java.util.HashMap<Kt, Vt>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors.txt b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors.txt
index aa663b5d34c..4a584ce549c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors.txt
@@ -4,5 +4,5 @@ public val test1: java.lang.Runnable
 public val test2: java.util.Comparator<kotlin.String>
 public val test3: java.util.Comparator<kotlin.String>
 public typealias ComparatorStrT = ComparatorT<kotlin.String>
-public typealias ComparatorT</*0*/ T>  = java.util.Comparator<T>
+public typealias ComparatorT</*0*/ T> = java.util.Comparator<T>
 public typealias RunnableT = java.lang.Runnable
diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.txt b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.txt
index 3c04183ccbe..0ab9cec8041 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.txt
@@ -33,8 +33,8 @@ public open class JHost {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-public typealias C</*0*/ T>  = JHost.Consumer<T>
-public typealias C2</*0*/ T>  = JHost.Consumer2<T, T>
+public typealias C</*0*/ T> = JHost.Consumer<T>
+public typealias C2</*0*/ T> = JHost.Consumer2<T, T>
 public typealias CStr = JHost.Consumer<kotlin.String>
 public typealias CStrList = JHost.Consumer<kotlin.collections.List<kotlin.String>>
 public typealias R = JHost.Runnable
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
index 9c457751e32..e24d94936ac 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
@@ -6,6 +6,6 @@ public fun test3(/*0*/ x: test.LLL<kotlin.String> /* = kotlin.collections.List<k
 public fun test4(/*0*/ x: test.L<test.L<kotlin.String> /* = kotlin.collections.List<kotlin.String> */> /* = kotlin.collections.List<kotlin.collections.List<kotlin.String>> */): kotlin.Unit
 public fun test5(/*0*/ x: test.LL<test.LL<kotlin.String> /* = kotlin.collections.List<kotlin.String> */> /* = kotlin.collections.List<kotlin.collections.List<kotlin.String>> */): kotlin.Unit
 public fun test6(/*0*/ x: test.LLL<test.LLL<kotlin.String> /* = kotlin.collections.List<kotlin.String> */> /* = kotlin.collections.List<kotlin.collections.List<kotlin.String>> */): kotlin.Unit
-public typealias L</*0*/ T>  = kotlin.collections.List<T>
-public typealias LL</*0*/ T>  = test.L<T>
-public typealias LLL</*0*/ T>  = test.LL<T>
+public typealias L</*0*/ T> = kotlin.collections.List<T>
+public typealias LL</*0*/ T> = test.L<T>
+public typealias LLL</*0*/ T> = test.LL<T>
diff --git a/compiler/testData/multiplatform/incompatibleClasses/output.txt b/compiler/testData/multiplatform/incompatibleClasses/output.txt
index 2a4bb7d59e7..ddc84732ccd 100644
--- a/compiler/testData/multiplatform/incompatibleClasses/output.txt
+++ b/compiler/testData/multiplatform/incompatibleClasses/output.txt
@@ -19,7 +19,7 @@ expect class C3<D, E : D>
                ^
 compiler/testData/multiplatform/incompatibleClasses/common.kt:18:16: error: expected class 'C4' has no actual declaration in module
 The following declaration is incompatible because upper bounds of type parameters are different:
-    public typealias C4<F>  = C4Impl<F>
+    public actual typealias C4<F> = C4Impl<F>
 
 expect class C4<F>
                ^
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 1e876a63793..59819dcc657 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -838,10 +838,11 @@ internal class DescriptorRendererImpl(
     private fun renderTypeAlias(typeAlias: TypeAliasDescriptor, builder: StringBuilder) {
         builder.renderAnnotations(typeAlias)
         renderVisibility(typeAlias.visibility, builder)
+        renderMemberModifiers(typeAlias, builder)
         builder.append(renderKeyword("typealias")).append(" ")
         renderName(typeAlias, builder)
 
-        renderTypeParameters(typeAlias.declaredTypeParameters, builder, true)
+        renderTypeParameters(typeAlias.declaredTypeParameters, builder, false)
         renderCapturedTypeParametersIfRequired(typeAlias, builder)
 
         builder.append(" = ").append(renderType(typeAlias.underlyingType))
diff --git a/idea/testData/decompiler/decompiledTextJs/TypeAliases.expected.kt b/idea/testData/decompiler/decompiledTextJs/TypeAliases.expected.kt
index f6d285423c5..e6d0e9d23e2 100644
--- a/idea/testData/decompiler/decompiledTextJs/TypeAliases.expected.kt
+++ b/idea/testData/decompiler/decompiledTextJs/TypeAliases.expected.kt
@@ -9,7 +9,7 @@ package test
 
 public final class Outer<E, F> public constructor() {
     public final inner class Inner<G> public constructor() {
-        @kotlin.Suppress public typealias TA<H>  = kotlin.collections.Map<kotlin.collections.Map<E, F>, kotlin.collections.Map<G, H>>
+        @kotlin.Suppress public typealias TA<H> = kotlin.collections.Map<kotlin.collections.Map<E, F>, kotlin.collections.Map<G, H>>
     }
 }
 
@@ -18,6 +18,6 @@ public final class TypeAliases public constructor() {
 
     @kotlin.Suppress public typealias B = (dependency.A) -> kotlin.Unit
 
-    @test.Ann @kotlin.Suppress private typealias Parametrized<E, F>  = kotlin.collections.Map<E, F>
+    @test.Ann @kotlin.Suppress private typealias Parametrized<E, F> = kotlin.collections.Map<E, F>
 }
 
diff --git a/idea/testData/decompiler/decompiledTextJvm/TypeAliases.expected.kt b/idea/testData/decompiler/decompiledTextJvm/TypeAliases.expected.kt
index 439b1adbdf2..009a90b4109 100644
--- a/idea/testData/decompiler/decompiledTextJvm/TypeAliases.expected.kt
+++ b/idea/testData/decompiler/decompiledTextJvm/TypeAliases.expected.kt
@@ -8,6 +8,6 @@ public final class TypeAliases public constructor() {
 
     @kotlin.Suppress public typealias B = (dependency.A) -> kotlin.Unit
 
-    @test.Ann @kotlin.Suppress private typealias Parametrized<E, F>  = kotlin.collections.Map<E, F>
+    @test.Ann @kotlin.Suppress private typealias Parametrized<E, F> = kotlin.collections.Map<E, F>
 }