diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
index fee13d7d3a9..222c097ec39 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedGetWithTooManyArgs.txt
@@ -43,4 +43,4 @@ KtErrorCallInfo:
           callableIdIfNonLocal = null)
       }
   ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: R|kotlin/Int|, b: R|kotlin/String|): R|kotlin/Boolean|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
index 074c7aa3e71..4e491da6f32 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/indexedSetWithTooManyArgs.txt
@@ -55,4 +55,4 @@ KtErrorCallInfo:
           callableIdIfNonLocal = null)
       }
   ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: R|kotlin/Int|, b: R|kotlin/String|, value: R|kotlin/Boolean|): R|kotlin/Unit|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt
index 0160dfef930..f274c0b89e4 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/simpleCallWithNonMatchingArgs.txt
@@ -14,4 +14,4 @@ KtErrorCallInfo:
       typeArgumentsMapping = {}
       argumentMapping = {}
   ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): R|kotlin/Unit|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): kotlin/Unit>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/delegatedConstructor.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/delegatedConstructor.txt
index 54984b4ba87..2a226be1b49 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/delegatedConstructor.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/delegatedConstructor.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for protected constructor(): R|A|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for protected constructor(): A>
   candidate = KtDelegatedConstructorCall:
     kind = SUPER_CALL
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/groupBy.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/groupBy.txt
index ac6e2024cd5..aa567c9970e 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/groupBy.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/groupBy.txt
@@ -48,7 +48,7 @@ KtApplicableCallCandidateInfo:
   isInBestCandidates = true
 
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final inline fun <T, K> R|kotlin/collections/Iterable<T>|.kotlin/collections/groupBy(keySelector: R|(T) -> K|): R|kotlin/collections/Map<K, kotlin/collections/List<T>>|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final inline fun <T, K> kotlin/collections/Iterable<T>.kotlin/collections/groupBy(keySelector: (T) -> K): kotlin/collections/Map<K, kotlin/collections/List<T>>>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicableDifferentParametersCount.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicableDifferentParametersCount.txt
index 92fe708bb2e..8078c402ce9 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicableDifferentParametersCount.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicableDifferentParametersCount.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public constructor(): R|A|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public constructor(): A>
   candidate = KtDelegatedConstructorCall:
     kind = SUPER_CALL
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt
index feae8d5b53e..8950ad112d1 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedGetWithTooManyArgs.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: R|kotlin/Int|, b: R|kotlin/String|): R|kotlin/Boolean|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt
index 2aa7dd0a5e0..607ead4f624 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/indexedSetWithTooManyArgs.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: R|kotlin/Int|, b: R|kotlin/String|, value: R|kotlin/Boolean|): R|kotlin/Unit|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt
index a278a4df27e..15d0b7c49c2 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/simpleCallWithNonMatchingArgs.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): R|kotlin/Unit|>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): kotlin/Unit>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
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 7f029ad0fd6..2a666e2fb81 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
@@ -129,9 +129,13 @@ object FirDiagnosticRenderers {
     val RENDER_TYPE_WITH_ANNOTATIONS = RENDER_TYPE
 
     val FQ_NAMES_IN_TYPES = Renderer { symbol: FirBasedSymbol<*> ->
+        val idRendererCreator = { ConeIdFullRenderer() }
         @OptIn(SymbolInternals::class)
         FirRenderer(
-            annotationRenderer = null, bodyRenderer = null, idRenderer = ConeIdFullRenderer()
+            annotationRenderer = null,
+            bodyRenderer = null,
+            idRenderer = idRendererCreator(),
+            typeRenderer = ConeTypeRendererWithJavaFlexibleTypes(idRendererCreator)
         ).renderElementAsString(symbol.fir, trim = true)
     }
 
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt
index e93c1038103..64eafe2b6ba 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererWithJavaFlexibleTypes.kt
@@ -15,7 +15,10 @@ class ConeTypeRendererWithJavaFlexibleTypes : ConeTypeRenderer {
 
     private val idRendererCreator: () -> ConeIdRenderer
 
-    @Suppress("ConvertSecondaryConstructorToPrimary")
+    constructor(idRendererCreator: () -> ConeIdRenderer) : super() {
+        this.idRendererCreator = idRendererCreator
+    }
+
     constructor(builder: StringBuilder, idRendererCreator: () -> ConeIdRenderer) : super() {
         this.builder = builder
         this.idRendererCreator = idRendererCreator
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.fir.kt
index ac78ef1cccd..175098a9037 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/tooManyArguments.fir.kt
@@ -7,5 +7,5 @@ annotation class Ann(val s: String = "")
 fun foo() {}
 
 val bar = foo(
-    <!TOO_MANY_ARGUMENTS("public final fun /foo(): R|kotlin/Unit|")!>15<!>
+    <!TOO_MANY_ARGUMENTS("public final fun /foo(): kotlin/Unit")!>15<!>
 )
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
index 34763332c31..2a6d3c62012 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
@@ -17,7 +17,7 @@ interface A {
 interface B : A {
     override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1; @An() val p1: @R|An|()  String")!>Int<!>
     @An
-    override <!VAR_OVERRIDDEN_BY_VAL("public abstract override val /B.p2: R|@R|An|()  kotlin/String|    public get(): R|@R|An|()  kotlin/String|; public abstract var /A.p2: R|@R|An|()  kotlin/String|    public get(): R|@R|An|()  kotlin/String|    public set(value: R|@R|An|()  kotlin/String|): R|kotlin/Unit|")!>val<!> p2: @An String
+    override <!VAR_OVERRIDDEN_BY_VAL("public abstract override val /B.p2: @R|An|()  kotlin/String    public get(): @R|An|()  kotlin/String; public abstract var /A.p2: @R|An|()  kotlin/String    public get(): @R|An|()  kotlin/String    public set(value: @R|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<!>
 }
 
diff --git a/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt
index 10850907428..47815b4fd3d 100644
--- a/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt
+++ b/plugins/assign-plugin/testData/diagnostics/otherOperators.fir.diag.txt
@@ -22,11 +22,11 @@
 
 /otherOperators.fir.kt:(1057,1066): error: No set method providing array access
 
-/otherOperators.fir.kt:(1128,1129): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String|
+/otherOperators.fir.kt:(1128,1129): error: Too many arguments for public final fun /StringProperty.get(): kotlin/String
 
 /otherOperators.fir.kt:(1131,1133): error: Unresolved reference: +=
 
-/otherOperators.fir.kt:(1177,1178): error: Too many arguments for public final fun /StringProperty.get(): R|kotlin/String|
+/otherOperators.fir.kt:(1177,1178): error: Too many arguments for public final fun /StringProperty.get(): kotlin/String
 
 /otherOperators.fir.kt:(1180,1182): error: Unresolved reference: +=