diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
index d9e3b01a021..fa120ca58ed 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
@@ -37,7 +37,7 @@ object FirDiagnosticRenderers {
             is FirClassLikeSymbol<*>,
             is FirCallableSymbol<*>,
             -> FirRenderer(
-                typeRenderer = ConeTypeRenderer(),
+                typeRenderer = ConeTypeRendererForReadability { ConeIdShortRenderer() },
                 idRenderer = ConeIdShortRenderer(),
                 classMemberRenderer = FirNoClassMemberRenderer(),
                 bodyRenderer = null,
diff --git a/compiler/testData/cli/jvm/firDeprecationJava.out b/compiler/testData/cli/jvm/firDeprecationJava.out
index 4a869ae3675..0acb52df94f 100644
--- a/compiler/testData/cli/jvm/firDeprecationJava.out
+++ b/compiler/testData/cli/jvm/firDeprecationJava.out
@@ -4,7 +4,7 @@ compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...)
 compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: String!, b: Int, c: Double): String!' is deprecated. Deprecated in Java.
     JavaClass().bar("", 1, 2.0)
                 ^
-compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: ft<MutableList<String!>, List<String!>?>' is deprecated. Deprecated in Java.
+compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: (MutableList<String!>..List<String!>?)' is deprecated. Deprecated in Java.
     val baz = JavaClass().baz
                           ^
 OK
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.fir.kt
index ca520443b2a..d808cdf5cd4 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/conflictingOverloads.fir.kt
@@ -4,7 +4,7 @@
 annotation class An
 
 @An
-data class <!CONFLICTING_OVERLOADS("[@An() fun copy(@An() x: @R|An|()  Int): @R|An|()  Int]")!>A(@An val x: @An Int)<!> {
-    <!CONFLICTING_OVERLOADS("[fun copy(@An() x: @R|An|()  Int = ...): A]")!>@An
+data class <!CONFLICTING_OVERLOADS("[@An() fun copy(@An() x: @An() Int): @An() Int]")!>A(@An val x: @An Int)<!> {
+    <!CONFLICTING_OVERLOADS("[fun copy(@An() x: @An() Int = ...): A]")!>@An
     fun copy(@An x: @An Int)<!> = x
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.fir.kt
index d93d39eff90..29ba0aded3a 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/multipleInheritedDefaults.fir.kt
@@ -17,10 +17,10 @@ interface B {
     fun foo(@An a: @An Int = @An 2)
 }
 
-<!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE("foo; @An() a: @R|An|()  Int = ...;     @An() fun foo(@An() a: @R|An|()  Int = ...): Unit, defined in A    @An() fun foo(@An() a: @R|An|()  Int = ...): Unit, defined in B")!>class AB1<!> : A, B
+<!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES_WHEN_NO_EXPLICIT_OVERRIDE("foo; @An() a: @An() Int = ...;     @An() fun foo(@An() a: @An() Int = ...): Unit, defined in A    @An() fun foo(@An() a: @An() Int = ...): Unit, defined in B")!>class AB1<!> : A, B
 
 @An
 class AB2 : A, B {
     @An
-    override fun foo(<!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES("foo; @An() a: @R|An|()  Int;     @An() fun foo(@An() a: @R|An|()  Int = ...): Unit, defined in A    @An() fun foo(@An() a: @R|An|()  Int = ...): Unit, defined in B")!>@An a: @An Int<!>) {}
+    override fun foo(<!MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES("foo; @An() a: @An() Int;     @An() fun foo(@An() a: @An() Int = ...): Unit, defined in A    @An() fun foo(@An() a: @An() Int = ...): Unit, defined in B")!>@An a: @An Int<!>) {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
index b9247705e9a..1bda6830638 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
@@ -15,12 +15,12 @@ interface A {
 
 @An
 interface B : A {
-    override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1; @An() val p1: @R|An|()  String")!>Int<!>
+    override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1; @An() val p1: @An() String")!>Int<!>
     @An
     override <!VAR_OVERRIDDEN_BY_VAL("public abstract override val /B.p2: @An() kotlin/String    public get(): @An() kotlin/String; public abstract var /A.p2: @An() kotlin/String    public get(): @An() kotlin/String    public set(value: @An() kotlin/String): kotlin/Unit")!>val<!> p2: @An String
-    override fun test(arg: String): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("test; @An() fun test(@An() arg: @R|An|()  String): @R|An|()  String")!>Int<!>
+    override fun test(arg: String): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("test; @An() fun test(@An() arg: @An() String): @An() String")!>Int<!>
 }
 
 interface C : A {
-    override var p2: <!VAR_TYPE_MISMATCH_ON_OVERRIDE("p2; @An() var p2: @R|An|()  String")!>Int<!>
+    override var p2: <!VAR_TYPE_MISMATCH_ON_OVERRIDE("p2; @An() var p2: @An() String")!>Int<!>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
index 694dccc4fe1..5ae5ef73fdf 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 annotation class An
 
 class B : A {
-    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo; @NotNull() @An() @MyTypeQualifier() fun foo(): @EnhancedNullability @R|An|()  String")!>String?<!> = null
+    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo; @NotNull() @An() @MyTypeQualifier() fun foo(): @An() String")!>String?<!> = null
 }
 
 @An
diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedError.fir.diag.txt b/compiler/testData/diagnostics/tests/deprecated/deprecatedError.fir.diag.txt
index 9ceb970d536..04eb853da78 100644
--- a/compiler/testData/diagnostics/tests/deprecated/deprecatedError.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedError.fir.diag.txt
@@ -1,5 +1,5 @@
 /deprecatedError.kt:(237,238): error: '@Deprecated(...) class C : Any' is deprecated. alas.
 
-/deprecatedError.kt:(246,249): error: '@Deprecated(...) fun foo(s: @R|Foo|()  String): Unit' is deprecated. alas.
+/deprecatedError.kt:(246,249): error: '@Deprecated(...) fun foo(s: @Foo() String): Unit' is deprecated. alas.
 
 /deprecatedError.kt:(258,259): error: 'constructor(): C' is deprecated. alas.