From d98da87278910978555d52fa8802cedafda11e62 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 21 Sep 2023 20:19:46 +0200
Subject: [PATCH] [FIR] Render dot-separated FQNs instead of slash-separated
 ones in diagnostics

^KT-62030 fixed
---
 ...egatedConstructorCall_super_unresolved.txt |  2 +-
 .../multipleCandidates/ambiguous.txt          |  6 +++---
 .../multipleCandidates/implicitInvoke.txt     |  4 ++--
 .../implicitInvokeWithReceiver.txt            |  2 +-
 .../delegatedConstructorInapplicable.txt      |  2 +-
 .../testData/contextCollector/enumValue.txt   |  4 ++--
 .../contextCollector/extensionFunction.txt    |  2 +-
 .../contextCollector/extensionLambdas.txt     |  4 ++--
 .../contextCollector/innerClasses.txt         |  4 ++--
 .../testData/contextCollector/localClass.txt  |  4 ++--
 .../contextCollector/nestedClasses.txt        |  2 +-
 .../propertyDelegateInitializer.txt           |  4 ++--
 .../scripts/insideClassMember.txt             |  2 +-
 .../scripts/insideTopLevelFunction.txt        |  2 +-
 .../contextCollector/scripts/topLevel.txt     |  2 +-
 .../testData/contextCollector/simple.txt      |  2 +-
 .../contextCollector/smartCasts/afterLoop.txt |  2 +-
 .../contextCollector/smartCasts/andRight.txt  |  4 ++--
 .../contextCollector/smartCasts/argument.txt  |  2 +-
 .../smartCasts/argumentAsReceiver.txt         |  2 +-
 .../smartCasts/dispatchReceiver.txt           |  2 +-
 .../smartCasts/extensionReceiver.txt          |  2 +-
 .../insideLetOnNullableReceiver.txt           |  4 ++--
 .../smartCasts/insideLoop.txt                 |  2 +-
 .../smartCasts/plainCheck.txt                 |  2 +-
 .../contextCollector/smartCasts/require.txt   |  2 +-
 .../contextCollector/smartCasts/when.txt      |  2 +-
 .../declaredInClass_fromInner_typeBound.txt   |  4 ++--
 ...laredInClass_fromInner_typeRefInMember.txt |  6 +++---
 .../declaredInClass_fromNested_typeBound.txt  |  4 ++--
 ...aredInClass_fromNested_typeRefInMember.txt |  2 +-
 .../dependentCopy/classBodyScript.context.txt |  2 +-
 .../dependentCopy/classScript.context.txt     |  2 +-
 .../moreStatementsInCopy.context.txt          |  2 +-
 .../testData/dependentCopy/script.context.txt |  2 +-
 .../dependentCopy/scriptFunction.context.txt  |  2 +-
 .../scriptInsideLastStatement.context.txt     |  2 +-
 .../scriptLastStatement.context.txt           |  2 +-
 .../scriptLastStatementCall.context.txt       |  2 +-
 .../dependentCopy/scriptStatement.context.txt |  2 +-
 .../scriptStatementCall.context.txt           |  2 +-
 .../invoke/threeReceiversCorrect.kt           |  2 +-
 .../problems/argumentTypeMismatch.kt          |  2 +-
 .../renderer/ConeIdRendererForDiagnostics.kt  | 19 +++++++++++++++++++
 .../ConeTypeRendererForReadability.kt         |  4 ++--
 .../kotlin/fir/types/ConeTypeUtils.kt         |  7 ++-----
 .../testData/cli/jvm/compatqualDefault.out    |  2 +-
 .../testData/cli/jvm/compatqualEnable.out     |  2 +-
 .../cli/jvm/conflictingProjection.out         |  2 +-
 .../firFriendlyErrorIfNoJdkOptionIsSet.out    |  2 +-
 compiler/testData/cli/jvm/firLightTreeOff.out |  2 +-
 compiler/testData/cli/jvm/firLightTreeOn.out  |  2 +-
 .../cli/jvm/instanceAccessBeforeSuperCall.out |  2 +-
 compiler/testData/cli/jvm/jspecifyDefault.out |  2 +-
 compiler/testData/cli/jvm/jspecifyStrict.out  |  2 +-
 .../cli/jvm/jsr305DefaultMigration.out        |  2 +-
 .../cli/jvm/jsr305DeprecatedEnable.out        |  2 +-
 .../testData/cli/jvm/jsr305FqNameIgnore.out   |  2 +-
 .../testData/cli/jvm/jsr305FqNameStrict.out   |  4 ++--
 .../cli/jvm/jsr305MigrationDefault.out        |  2 +-
 compiler/testData/cli/jvm/jsr305Strict.out    |  2 +-
 .../cli/jvm/nullabilityAnnotations.out        |  2 +-
 .../cli/jvm/reportInternalDiagnosticNames.out |  2 +-
 .../cli/jvm/werrorWithExplicitError.out       |  2 +-
 .../tests/PropertyInitializers.fir.kt         |  2 +-
 .../annotationRenderingInTypes.fir.kt         |  6 +++---
 .../rendering/memberProjectedOut.fir.kt       |  2 +-
 .../typeMismatchDueToTypeProjections.fir.kt   |  2 +-
 ...ParameterToUnitImplicitLiteralsCase.fir.kt |  4 ++--
 ...hReceiverToUnitImplicitLiteralsCase.fir.kt |  4 ++--
 ...leNothingNullLiteralMaterializeCase.fir.kt |  2 +-
 .../kt45461.fir.diag.txt                      |  2 +-
 .../kt45461_12.fir.diag.txt                   |  2 +-
 .../kt45461_2.fir.diag.txt                    |  4 ++--
 .../kt45461_25.fir.diag.txt                   |  6 +++---
 .../emptyIntersectionTypes/kt45461_25.fir.kt  |  2 +-
 .../kt45461_26.fir.diag.txt                   |  4 ++--
 .../kt45461_5.fir.diag.txt                    |  2 +-
 .../kt48765.fir.diag.txt                      |  6 +++---
 .../kt49661.fir.diag.txt                      |  2 +-
 ...terWithKotlinNullableWarnings.fir.diag.txt |  4 ++--
 .../tests/nullableTypes/kt58844.fir.kt        |  4 ++--
 .../tests/regressions/kt251.fir.kt            |  2 +-
 .../specialConstructions/elvisAsCall.fir.kt   |  2 +-
 .../exclExclAsCall.fir.kt                     |  2 +-
 ...ienPropertyFromInvisibleClass.fir.diag.txt |  4 ++--
 ...cTypeArgumentInsteadOfTypeParameter.fir.kt |  2 +-
 .../upperBoundViolated2.fir.diag.txt          |  2 +-
 .../build.log.expected                        |  4 ++--
 .../diagnostics/localVariables.fir.diag.txt   |  6 +++---
 .../methodDeclaration.fir.diag.txt            |  2 +-
 .../diagnostics/noAnnotation.fir.diag.txt     |  8 ++++----
 92 files changed, 146 insertions(+), 130 deletions(-)
 create mode 100644 compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeIdRendererForDiagnostics.kt

diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt
index fea1e628a5a..f1213abf52b 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/delegatedConstructorCall_super_unresolved.txt
@@ -28,4 +28,4 @@ KtErrorCallInfo:
           callableIdIfNonLocal = null)
       }
   ]
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/String', but 'kotlin/Int' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.String', but 'kotlin.Int' was expected.>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt
index ae3f30e5acf..c757e2e17a2 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/ambiguous.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Char' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.Char' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -30,7 +30,7 @@ KtInapplicableCallCandidateInfo:
   isInBestCandidates = true
 
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Boolean' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.Boolean' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -61,7 +61,7 @@ KtInapplicableCallCandidateInfo:
   isInBestCandidates = true
 
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/String' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.String' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt
index 0592242584f..29b5736c504 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvoke.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean', but 'kotlin/Int' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Boolean', but 'kotlin.Int' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = true
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -33,7 +33,7 @@ KtInapplicableCallCandidateInfo:
   isInBestCandidates = false
 
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean', but 'kotlin/Char' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Boolean', but 'kotlin.Char' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt
index bebd0818087..ee3511d9b6c 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/multipleCandidates/implicitInvokeWithReceiver.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Boolean' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.Boolean' was expected.>
   candidate = KtSimpleFunctionCall:
     isImplicitInvoke = false
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicable.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicable.txt
index 971b33d79aa..0cc9520aa55 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicable.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/delegatedConstructorInapplicable.txt
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/String' was expected.>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.String' was expected.>
   candidate = KtDelegatedConstructorCall:
     kind = SUPER_CALL
     partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
diff --git a/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt b/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt
index 20d8600a3f2..fe69256b6fd 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/enumValue.txt
@@ -16,7 +16,7 @@ Tower Data Context:
     Element 7
         Implicit receiver:
             FirRegularClassSymbol public final companion object Companion : R|kotlin/Any|
-                Type: kotlin/Enum.Companion
+                Type: kotlin.Enum.Companion
     Element 8
         Scope: FirNestedClassifierScopeWithSubstitution
             Classifiers:
@@ -78,4 +78,4 @@ FILE: [ResolvedTo(IMPORTS)] enumValue.kt
         public final static [ResolvedTo(STATUS)] val entries: R|kotlin/enums/EnumEntries<Direction>|
             public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries<Direction>|
 
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt b/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt
index 9482e735123..efe0eab6b99 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/extensionFunction.txt
@@ -18,7 +18,7 @@ Tower Data Context:
     Element 8
         Implicit receiver:
             FirNamedFunctionSymbol public final fun R|kotlin/String|.test(): R|kotlin/Unit|
-                Type: kotlin/String
+                Type: kotlin.String
     Element 9
         Scope: FirLocalScope
 
diff --git a/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt b/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt
index f05b815b50b..e8aab9fe896 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/extensionLambdas.txt
@@ -22,7 +22,7 @@ Tower Data Context:
     Element 10
         Implicit receiver:
             FirAnonymousFunctionSymbol foo@fun R|kotlin/String|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>
-                Type: kotlin/String
+                Type: kotlin.String
     Element 11
         Scope: FirLocalScope
     Element 12
@@ -30,7 +30,7 @@ Tower Data Context:
     Element 13
         Implicit receiver:
             FirAnonymousFunctionSymbol num@fun R|kotlin/Int|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>
-                Type: kotlin/Int
+                Type: kotlin.Int
     Element 14
         Scope: FirLocalScope
 
diff --git a/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt b/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt
index 3d5aef74f20..896c4b43676 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/innerClasses.txt
@@ -24,7 +24,7 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol public final class Foo<F> : R|kotlin/Any|
-                Type: test/Foo<F>
+                Type: test.Foo<F>
     Element 10
         Scope: FirMemberTypeParameterScope
             Classifiers:
@@ -32,7 +32,7 @@ Tower Data Context:
     Element 11
         Implicit receiver:
             FirRegularClassSymbol public final inner class Bar<B, Outer(F)> : R|kotlin/Any|
-                Type: test/Foo.Bar<B, F>
+                Type: test.Foo.Bar<B, F>
     Element 12
         Scope: FirLocalScope
             Properties:
diff --git a/analysis/low-level-api-fir/testData/contextCollector/localClass.txt b/analysis/low-level-api-fir/testData/contextCollector/localClass.txt
index 97e01e8efc8..1457681f5bc 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/localClass.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/localClass.txt
@@ -22,7 +22,7 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol local final class Local : R|kotlin/Any|
-                Type: <local>/Local
+                Type: <local>.Local
     Element 10
         Scope: FirLocalScope
     Element 11
@@ -42,4 +42,4 @@ FILE: [ResolvedTo(IMPORTS)] localClass.kt
         }
 
         R|<local>/Local.Local|().R|<local>/foo|()
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt b/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt
index 20e902a3e9d..1f1f34fac24 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/nestedClasses.txt
@@ -24,7 +24,7 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol public final class Bar<B> : R|kotlin/Any|
-                Type: test/Foo.Bar<B>
+                Type: test.Foo.Bar<B>
     Element 10
         Scope: FirLocalScope
             Properties:
diff --git a/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt b/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt
index 0743979e4cb..835455ec88a 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/propertyDelegateInitializer.txt
@@ -16,7 +16,7 @@ Tower Data Context:
     Element 7
         Implicit receiver:
             FirRegularClassSymbol public final class Foo : R|kotlin/Any|
-                Type: test/Foo
+                Type: test.Foo
     Element 8
         Scope: FirLocalScope
             Properties:
@@ -40,4 +40,4 @@ FILE: [ResolvedTo(IMPORTS)] propertyDelegateInitializer.kt
                 ^ this@R|test/Foo|.D|test/Foo.property|.R|test/MyInterface.getValue|(this@R|test/Foo|, ::R|test/Foo.property|)
             }
 
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt
index a3f153330f9..d1b069317b5 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt
@@ -50,7 +50,7 @@ Tower Data Context:
                     public? get(): <implicit>
 
                 public? final? class After_OtherClass : R|kotlin/Any|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Implicit receiver:
diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt
index ff23ba7c2ef..0738a20292d 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideTopLevelFunction.txt
@@ -50,7 +50,7 @@ Tower Data Context:
                     public? get(): <implicit>
 
                 public? final? class After_OtherClass : R|kotlin/Any|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Scope: FirLocalScope
diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt
index cc75719438e..5a78d92798f 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt
@@ -51,7 +51,7 @@ Tower Data Context:
                     public get(): R|kotlin/Int|
 
                 public final class After_OtherClass : R|kotlin/Any|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
 
 FILE: [ResolvedTo(IMPORTS)] topLevel.kts
diff --git a/analysis/low-level-api-fir/testData/contextCollector/simple.txt b/analysis/low-level-api-fir/testData/contextCollector/simple.txt
index 194909351fb..fbaa2e9f890 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/simple.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/simple.txt
@@ -16,7 +16,7 @@ Tower Data Context:
     Element 7
         Implicit receiver:
             FirRegularClassSymbol public final class Foo : R|kotlin/Any|
-                Type: foo/Foo
+                Type: foo.Foo
     Element 8
         Scope: FirLocalScope
             Properties:
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/afterLoop.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/afterLoop.txt
index ba3821f67d9..2329ed8a786 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/afterLoop.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/afterLoop.txt
@@ -24,7 +24,7 @@ Tower Data Context:
 Smart Casts:
     FirPropertySymbol lvar current: R|Node?|
     Types:
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] afterLoop.kt
     public abstract [ResolvedTo(STATUS)] interface Node : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/andRight.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/andRight.txt
index 9cb913b60bd..3f25fb3eee0 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/andRight.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/andRight.txt
@@ -23,7 +23,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] andRight.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
@@ -40,4 +40,4 @@ FILE: [ResolvedTo(IMPORTS)] andRight.kt
 
     }
     public final [ResolvedTo(CONTRACTS)] fun consume([ResolvedTo(CONTRACTS)] obj: R|Foo|): R|kotlin/Unit| {
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argument.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argument.txt
index 0f664ad7cef..0a8269fcd15 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argument.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argument.txt
@@ -25,7 +25,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] argument.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argumentAsReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argumentAsReceiver.txt
index 972e672d7bd..8d2c8b2d5c1 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argumentAsReceiver.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/argumentAsReceiver.txt
@@ -27,7 +27,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
         Bar
 
 FILE: [ResolvedTo(IMPORTS)] argumentAsReceiver.kt
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/dispatchReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/dispatchReceiver.txt
index d4e6676234a..d5f61664516 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/dispatchReceiver.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/dispatchReceiver.txt
@@ -27,7 +27,7 @@ Smart Casts:
     FirRegularClassSymbol public open class Foo : R|kotlin/Any|
     Types:
         Bar
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] dispatchReceiver.kt
     public open [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/extensionReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/extensionReceiver.txt
index 2a4aef4995b..36c39ecd230 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/extensionReceiver.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/extensionReceiver.txt
@@ -27,7 +27,7 @@ Smart Casts:
     FirNamedFunctionSymbol public final fun R|kotlin/Any|.test(): R|kotlin/Unit|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] extensionReceiver.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLetOnNullableReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLetOnNullableReceiver.txt
index 44422db7cab..4c6901c1037 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLetOnNullableReceiver.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLetOnNullableReceiver.txt
@@ -28,7 +28,7 @@ Tower Data Context:
 Smart Casts:
     FirValueParameterSymbol param: R|kotlin/String?|
     Types:
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] insideLetOnNullableReceiver.kt
     public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/String?|): R|kotlin/String| {
@@ -37,4 +37,4 @@ FILE: [ResolvedTo(IMPORTS)] insideLetOnNullableReceiver.kt
         }
         ) }
         ^foo String()
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLoop.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLoop.txt
index c6e32237ccb..1ea6282c45b 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLoop.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/insideLoop.txt
@@ -26,7 +26,7 @@ Tower Data Context:
 Smart Casts:
     FirPropertySymbol lvar current: R|Node|
     Types:
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] insideLoop.kt
     public abstract [ResolvedTo(STATUS)] interface Node : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/plainCheck.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/plainCheck.txt
index 199c5fa323b..557327cf300 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/plainCheck.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/plainCheck.txt
@@ -26,7 +26,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] plainCheck.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/require.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/require.txt
index 8bb345fb721..9b623e68b10 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/require.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/require.txt
@@ -23,7 +23,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Foo
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] require.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/when.txt b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/when.txt
index 65418150cc5..b92873d7bf4 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/smartCasts/when.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/smartCasts/when.txt
@@ -25,7 +25,7 @@ Smart Casts:
     FirValueParameterSymbol obj: R|kotlin/Any|
     Types:
         Bar
-        kotlin/Any
+        kotlin.Any
 
 FILE: [ResolvedTo(IMPORTS)] when.kt
     public abstract [ResolvedTo(STATUS)] interface Foo : R|kotlin/Any| {
diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt
index 06a891d9995..fc25fba10dd 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt
@@ -24,7 +24,7 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol public final class Outer<MyParam> : R|kotlin/Any|
-                Type: test/Outer<MyParam>
+                Type: test.Outer<MyParam>
     Element 10
         Scope: FirMemberTypeParameterScope
             Classifiers:
@@ -43,4 +43,4 @@ FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromInner_typeBound.kt
 
         }
 
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt
index bea92c81f00..2ee306beee2 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt
@@ -24,13 +24,13 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol public final class Outer<MyParam> : R|kotlin/Any|
-                Type: test/Outer<MyParam>
+                Type: test.Outer<MyParam>
     Element 10
         Scope: FirMemberTypeParameterScope
     Element 11
         Implicit receiver:
             FirRegularClassSymbol public final inner class Inner<Outer(MyParam)> : R|kotlin/Any|
-                Type: test/Outer.Inner<MyParam>
+                Type: test.Outer.Inner<MyParam>
     Element 12
         Scope: FirLocalScope
             Properties:
@@ -52,4 +52,4 @@ FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromInner_typeRefInMember.kt
 
         }
 
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt
index a7c0d55e504..58008e513ef 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt
@@ -24,7 +24,7 @@ Tower Data Context:
     Element 9
         Implicit receiver:
             FirRegularClassSymbol public final class Outer<MyParam> : R|kotlin/Any|
-                Type: test/Outer<MyParam>
+                Type: test.Outer<MyParam>
     Element 10
         Scope: FirMemberTypeParameterScope
             Classifiers:
@@ -43,4 +43,4 @@ FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromNested_typeBound.kt
 
         }
 
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt
index f03b2b5b048..490dbb9ed08 100644
--- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt
+++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt
@@ -20,7 +20,7 @@ Tower Data Context:
     Element 8
         Implicit receiver:
             FirRegularClassSymbol public final class Nested : R|kotlin/Any|
-                Type: test/Outer.Nested
+                Type: test.Outer.Nested
     Element 9
         Scope: FirLocalScope
             Properties:
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/classBodyScript.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/classBodyScript.context.txt
index e1fc0a9ebfd..47af0d6a3fa 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/classBodyScript.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/classBodyScript.context.txt
@@ -30,7 +30,7 @@ Tower Data Context:
                 lval args: R|kotlin/Array<kotlin/String>|
 
                 public? final? class A : R|kotlin/Any|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Implicit receiver:
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/classScript.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/classScript.context.txt
index 78a4376d89a..d89a36859c4 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/classScript.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/classScript.context.txt
@@ -30,7 +30,7 @@ Tower Data Context:
                 lval args: R|kotlin/Array<kotlin/String>|
 
                 public? final? class A : R|kotlin/Any|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Implicit receiver:
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/moreStatementsInCopy.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/moreStatementsInCopy.context.txt
index e66dd3414f3..f4c1f160788 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/moreStatementsInCopy.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/moreStatementsInCopy.context.txt
@@ -40,5 +40,5 @@ Tower Data Context:
                 R|/foo|(R|/scriptFunction|(), <L> = foo@fun <anonymous>(it: R|kotlin/Int|): R|kotlin/Unit| <inline=NoInline> )
                 public final val $$result: R|kotlin/Int|
                     public get(): R|kotlin/Int|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/script.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/script.context.txt
index ab8a4100b4e..7a18cf82fac 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/script.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/script.context.txt
@@ -41,5 +41,5 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptFunction.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptFunction.context.txt
index 92b17207078..d28c3fa81e9 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptFunction.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptFunction.context.txt
@@ -43,7 +43,7 @@ Tower Data Context:
                 public? final? fun foo(i: Int, action: ( (Int) -> Unit )): R|kotlin/Unit|
                 public final val $$result: <implicit>
                     public get(): <implicit>
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Scope: FirLocalScope
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptInsideLastStatement.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptInsideLastStatement.context.txt
index e5459245292..4b02889ff0e 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptInsideLastStatement.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptInsideLastStatement.context.txt
@@ -41,7 +41,7 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
     Element 10
         Scope: FirLocalScope
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatement.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatement.context.txt
index 3799e063a8c..d25f9c0d23e 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatement.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatement.context.txt
@@ -41,5 +41,5 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatementCall.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatementCall.context.txt
index 394902ec53d..b78c02a8d26 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatementCall.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptLastStatementCall.context.txt
@@ -41,5 +41,5 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptStatement.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptStatement.context.txt
index bfd74aeeda4..da4388427f0 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptStatement.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptStatement.context.txt
@@ -41,5 +41,5 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/analysis/low-level-api-fir/testData/dependentCopy/scriptStatementCall.context.txt b/analysis/low-level-api-fir/testData/dependentCopy/scriptStatementCall.context.txt
index 4e5d8483894..cf17a10bc3a 100644
--- a/analysis/low-level-api-fir/testData/dependentCopy/scriptStatementCall.context.txt
+++ b/analysis/low-level-api-fir/testData/dependentCopy/scriptStatementCall.context.txt
@@ -41,5 +41,5 @@ Tower Data Context:
                 public final fun foo(i: R|kotlin/Int|, action: R|(kotlin/Int) -> kotlin/Unit|): R|kotlin/Unit|
                 public final val $$result: R|kotlin/Unit|
                     public get(): R|kotlin/Unit|
-                Type: kotlin/script/templates/standard/ScriptTemplateWithArgs
+                Type: kotlin.script.templates.standard.ScriptTemplateWithArgs
                 Label: <script>
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.kt
index ad2cc3aa1ae..e633cb332f4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.kt
@@ -3,7 +3,7 @@ class C
 class B
 
 class A {
-    val B.foo: C.() -> Unit get() = <!NULL_FOR_NONNULL_TYPE("kotlin/Function1<C, kotlin/Unit>")!>null<!>
+    val B.foo: C.() -> Unit get() = <!NULL_FOR_NONNULL_TYPE("kotlin.Function1<C, kotlin.Unit>")!>null<!>
 }
 
 fun <T, R> with(arg: T, f: T.() -> R): R = arg.f()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.kt
index 644abac2d8e..216eecf9528 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/argumentTypeMismatch.kt
@@ -9,5 +9,5 @@ public class Sample {
 // FILE: test.kt
 
 fun main() {
-    Sample.foo(<!ARGUMENT_TYPE_MISMATCH("kotlin/collections/(Mutable)List<kotlin/collections/(Mutable)List<kotlin/String!>!>!; kotlin/String")!>"123"<!>)
+    Sample.foo(<!ARGUMENT_TYPE_MISMATCH("kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!; kotlin.String")!>"123"<!>)
 }
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeIdRendererForDiagnostics.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeIdRendererForDiagnostics.kt
new file mode 100644
index 00000000000..523a791ccc2
--- /dev/null
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeIdRendererForDiagnostics.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir.renderer
+
+import org.jetbrains.kotlin.name.CallableId
+import org.jetbrains.kotlin.name.ClassId
+
+class ConeIdRendererForDiagnostics : ConeIdRenderer() {
+    override fun renderClassId(classId: ClassId) {
+        builder.append(classId.asFqNameString())
+    }
+
+    override fun renderCallableId(callableId: CallableId) {
+        builder.append(callableId.asSingleFqName().asString())
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
index 1b80121e6cc..0c1422e20f1 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/renderer/ConeTypeRendererForReadability.kt
@@ -38,7 +38,7 @@ class ConeTypeRendererForReadability(
             return "$lowerRendered!"
         }
 
-        val kotlinCollectionsPrefix = StandardNames.COLLECTIONS_PACKAGE_FQ_NAME.asString().replace(".", "/") + "/"
+        val kotlinCollectionsPrefix = StandardNames.COLLECTIONS_PACKAGE_FQ_NAME.asString() + "."
         val mutablePrefix = "Mutable"
         // java.util.List<Foo> -> (Mutable)List<Foo!>!
         val simpleCollection = replacePrefixesInTypeRepresentations(
@@ -59,7 +59,7 @@ class ConeTypeRendererForReadability(
         )
         if (mutableEntry != null) return mutableEntry
 
-        val kotlinPrefix = StandardNames.BUILT_INS_PACKAGE_FQ_NAME.asString() + "/"
+        val kotlinPrefix = StandardNames.BUILT_INS_PACKAGE_FQ_NAME.asString() + "."
         // Foo[] -> Array<(out) Foo!>!
         val array = replacePrefixesInTypeRepresentations(
             lowerRendered = lowerRendered,
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
index a5dd38b057b..1e6af026066 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypeUtils.kt
@@ -5,10 +5,7 @@
 
 package org.jetbrains.kotlin.fir.types
 
-import org.jetbrains.kotlin.fir.renderer.ConeIdRendererForDebugging
-import org.jetbrains.kotlin.fir.renderer.ConeIdShortRenderer
-import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererForDebugging
-import org.jetbrains.kotlin.fir.renderer.ConeTypeRendererForReadability
+import org.jetbrains.kotlin.fir.renderer.*
 import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.types.Variance
@@ -127,7 +124,7 @@ fun ConeKotlinType.renderReadable(): String {
 
 fun ConeKotlinType.renderReadableWithFqNames(): String {
     val builder = StringBuilder()
-    ConeTypeRendererForReadability(builder) { ConeIdRendererForDebugging() }.render(this)
+    ConeTypeRendererForReadability(builder) { ConeIdRendererForDiagnostics() }.render(this)
     return builder.toString()
 }
 
diff --git a/compiler/testData/cli/jvm/compatqualDefault.out b/compiler/testData/cli/jvm/compatqualDefault.out
index fd67c4d6118..3b72b74dc49 100644
--- a/compiler/testData/cli/jvm/compatqualDefault.out
+++ b/compiler/testData/cli/jvm/compatqualDefault.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     b.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/compatqualEnable.out b/compiler/testData/cli/jvm/compatqualEnable.out
index fd67c4d6118..3b72b74dc49 100644
--- a/compiler/testData/cli/jvm/compatqualEnable.out
+++ b/compiler/testData/cli/jvm/compatqualEnable.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/compatqualUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     b.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/conflictingProjection.out b/compiler/testData/cli/jvm/conflictingProjection.out
index bb345ed7026..40a8ca5c0bc 100644
--- a/compiler/testData/cli/jvm/conflictingProjection.out
+++ b/compiler/testData/cli/jvm/conflictingProjection.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/conflictingProjection.kt:10:19: error: projection is conflicting with variance of the corresponding type parameter of 'Out<in kotlin/Int>'. Remove the projection or replace it with '*'.
+compiler/testData/cli/jvm/conflictingProjection.kt:10:19: error: projection is conflicting with variance of the corresponding type parameter of 'Out<in kotlin.Int>'. Remove the projection or replace it with '*'.
 fun a8(value: Out<in Int>) {}
                   ^
 compiler/testData/cli/jvm/conflictingProjection.kt:17:15: error: variance annotations are only allowed for type parameters of classes and interfaces.
diff --git a/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out b/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out
index 1da827adae0..657533481b8 100644
--- a/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out
+++ b/compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.out
@@ -1,7 +1,7 @@
 compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: unresolved reference 'NullPointerException'.
     throw NullPointerException()
           ^
-compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: type mismatch: inferred type is 'ERROR CLASS: Unresolved name: NullPointerException', but 'kotlin/Throwable' was expected.
+compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: type mismatch: inferred type is 'ERROR CLASS: Unresolved name: NullPointerException', but 'kotlin.Throwable' was expected.
     throw NullPointerException()
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/firLightTreeOff.out b/compiler/testData/cli/jvm/firLightTreeOff.out
index 43aea46c2fe..61bbf2420af 100644
--- a/compiler/testData/cli/jvm/firLightTreeOff.out
+++ b/compiler/testData/cli/jvm/firLightTreeOff.out
@@ -7,7 +7,7 @@ compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System
 compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected.
     java.lang.System = null
               ^
-compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin/Unit'.
+compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin.Unit'.
     java.lang.System = null
                        ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/firLightTreeOn.out b/compiler/testData/cli/jvm/firLightTreeOn.out
index 43aea46c2fe..61bbf2420af 100644
--- a/compiler/testData/cli/jvm/firLightTreeOn.out
+++ b/compiler/testData/cli/jvm/firLightTreeOn.out
@@ -7,7 +7,7 @@ compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System
 compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected.
     java.lang.System = null
               ^
-compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin/Unit'.
+compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin.Unit'.
     java.lang.System = null
                        ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out b/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out
index 2703bd0a738..348a3b5e617 100644
--- a/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out
+++ b/compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.out
@@ -10,7 +10,7 @@ compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:74: error: cannot a
 compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:7:20: error: 'this' is not defined in this context.
 class B(other: B = this)
                    ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:10:32: error: argument type mismatch: actual type is 'kotlin/Function0<ERROR CLASS: Unknown return lambda parameter type>', but 'kotlin/Int' was expected.
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:10:32: error: argument type mismatch: actual type is 'kotlin.Function0<ERROR CLASS: Unknown return lambda parameter type>', but 'kotlin.Int' was expected.
     constructor(x: Int) : this({
                                ^
 compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:12:9: error: cannot access '<this>' before the instance has been initialized.
diff --git a/compiler/testData/cli/jvm/jspecifyDefault.out b/compiler/testData/cli/jvm/jspecifyDefault.out
index 48e9615b774..84f90ffadc2 100644
--- a/compiler/testData/cli/jvm/jspecifyDefault.out
+++ b/compiler/testData/cli/jvm/jspecifyDefault.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     a.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jspecifyStrict.out b/compiler/testData/cli/jvm/jspecifyStrict.out
index 48e9615b774..84f90ffadc2 100644
--- a/compiler/testData/cli/jvm/jspecifyStrict.out
+++ b/compiler/testData/cli/jvm/jspecifyStrict.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jspecifyUsage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     a.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305DefaultMigration.out b/compiler/testData/cli/jvm/jsr305DefaultMigration.out
index 8ce1f96bd9d..02c7e6c9075 100644
--- a/compiler/testData/cli/jvm/jsr305DefaultMigration.out
+++ b/compiler/testData/cli/jvm/jsr305DefaultMigration.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jsr305DefaultMigration.kt:2:19: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305DefaultMigration.kt:2:19: error: null cannot be a value of a non-null type 'kotlin.String'.
     annotated.foo(null)
                   ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out
index 4e02f7bbc62..8080b05bd3b 100644
--- a/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out
+++ b/compiler/testData/cli/jvm/jsr305DeprecatedEnable.out
@@ -1,6 +1,6 @@
 warning: argument -Xjsr305-annotations is deprecated. Please use -Xjsr305 instead
 warning: option 'enable' for -Xjsr305 flag is deprecated. Please use 'strict' instead
-compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     a.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305FqNameIgnore.out b/compiler/testData/cli/jvm/jsr305FqNameIgnore.out
index 249b5f5931f..9c3b1a6641e 100644
--- a/compiler/testData/cli/jvm/jsr305FqNameIgnore.out
+++ b/compiler/testData/cli/jvm/jsr305FqNameIgnore.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin.String'.
     annotated.bar(null)
                   ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305FqNameStrict.out b/compiler/testData/cli/jvm/jsr305FqNameStrict.out
index 9acb2503beb..832742ddb63 100644
--- a/compiler/testData/cli/jvm/jsr305FqNameStrict.out
+++ b/compiler/testData/cli/jvm/jsr305FqNameStrict.out
@@ -1,7 +1,7 @@
-compiler/testData/cli/jvm/jsr305Migration.kt:2:19: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Migration.kt:2:19: error: null cannot be a value of a non-null type 'kotlin.String'.
     annotated.foo(null)
                   ^
-compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin.String'.
     annotated.bar(null)
                   ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305MigrationDefault.out b/compiler/testData/cli/jvm/jsr305MigrationDefault.out
index 249b5f5931f..9c3b1a6641e 100644
--- a/compiler/testData/cli/jvm/jsr305MigrationDefault.out
+++ b/compiler/testData/cli/jvm/jsr305MigrationDefault.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Migration.kt:3:19: error: null cannot be a value of a non-null type 'kotlin.String'.
     annotated.bar(null)
                   ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/jsr305Strict.out b/compiler/testData/cli/jvm/jsr305Strict.out
index c23ead19d1c..9121ec0f064 100644
--- a/compiler/testData/cli/jvm/jsr305Strict.out
+++ b/compiler/testData/cli/jvm/jsr305Strict.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/jsr305Usage.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     a.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/nullabilityAnnotations.out b/compiler/testData/cli/jvm/nullabilityAnnotations.out
index 875ef3e7a0e..468c9f0e974 100644
--- a/compiler/testData/cli/jvm/nullabilityAnnotations.out
+++ b/compiler/testData/cli/jvm/nullabilityAnnotations.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/severalAnnotations.kt:2:11: error: null cannot be a value of a non-null type 'kotlin/String'.
+compiler/testData/cli/jvm/severalAnnotations.kt:2:11: error: null cannot be a value of a non-null type 'kotlin.String'.
     a.foo(null)
           ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out b/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out
index ce89998f00f..c40cf9784b1 100644
--- a/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out
+++ b/compiler/testData/cli/jvm/reportInternalDiagnosticNames.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:2:21: error: [INITIALIZER_TYPE_MISMATCH] Initializer type mismatch: expected 'kotlin/String', actual 'kotlin/Int'.
+compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:2:21: error: [INITIALIZER_TYPE_MISMATCH] Initializer type mismatch: expected 'kotlin.String', actual 'kotlin.Int'.
     val x: String = 1
                     ^
 compiler/testData/cli/jvm/reportInternalDiagnosticNames.kt:3:1: error: [NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY] A 'return' expression is required in a function with a block body ('{...}').
diff --git a/compiler/testData/cli/jvm/werrorWithExplicitError.out b/compiler/testData/cli/jvm/werrorWithExplicitError.out
index 25566a63e69..3b16f6c8a2f 100644
--- a/compiler/testData/cli/jvm/werrorWithExplicitError.out
+++ b/compiler/testData/cli/jvm/werrorWithExplicitError.out
@@ -1,4 +1,4 @@
-compiler/testData/cli/jvm/werrorWithExplicitError.kt:4:6: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin/String?'.
+compiler/testData/cli/jvm/werrorWithExplicitError.kt:4:6: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type 'kotlin.String?'.
     t.length
      ^
 COMPILATION_ERROR
diff --git a/compiler/testData/diagnostics/tests/PropertyInitializers.fir.kt b/compiler/testData/diagnostics/tests/PropertyInitializers.fir.kt
index b781eed6699..fe2a3f907a0 100644
--- a/compiler/testData/diagnostics/tests/PropertyInitializers.fir.kt
+++ b/compiler/testData/diagnostics/tests/PropertyInitializers.fir.kt
@@ -9,5 +9,5 @@ class Foo(val a: Int, b: Int) {
     val e: Int
         get() = <!UNRESOLVED_REFERENCE!>b<!>
 
-    val map: Map<String, Int> = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH("kotlin/String; kotlin/Int"), TYPE_MISMATCH("kotlin/String; kotlin/Int"), TYPE_MISMATCH("kotlin/Int; kotlin/String"), TYPE_MISMATCH("kotlin/String; kotlin/Int"), TYPE_MISMATCH("kotlin/Int; kotlin/String")!>mapOf(1 to "hello")<!>
+    val map: Map<String, Int> = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH("kotlin.String; kotlin.Int"), TYPE_MISMATCH("kotlin.String; kotlin.Int"), TYPE_MISMATCH("kotlin.Int; kotlin.String"), TYPE_MISMATCH("kotlin.String; kotlin.Int"), TYPE_MISMATCH("kotlin.Int; kotlin.String")!>mapOf(1 to "hello")<!>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
index fa6c8284ffc..7d6814ec7b3 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
@@ -12,14 +12,14 @@ annotation class Ann
 fun <@Ann R : @Ann Any> f3(a: Array<@Ann R>): Array<@Ann R?> =  null!!
 
 fun test2(a: @Ann Array<in @Ann Int>) {
-    val r: Array<in Int?> = f3(<!ARGUMENT_TYPE_MISMATCH("kotlin/Array<@Ann() R>; @Ann() kotlin/Array<CapturedType(in @Ann() kotlin/Int)>")!>a<!>)
+    val r: Array<in Int?> = f3(<!ARGUMENT_TYPE_MISMATCH("kotlin.Array<@Ann() R>; @Ann() kotlin.Array<CapturedType(in @Ann() kotlin.Int)>")!>a<!>)
 }
 
 
 var test3: Int = 0
-    set(s: <!WRONG_SETTER_PARAMETER_TYPE("kotlin/Int; @Ann() kotlin/String")!>@Ann String<!>) {}
+    set(s: <!WRONG_SETTER_PARAMETER_TYPE("kotlin.Int; @Ann() kotlin.String")!>@Ann String<!>) {}
 
 
 fun f4(fn: (@Ann Int, @Ann Int) -> Unit) {}
 
-val test4 = f4 <!ARGUMENT_TYPE_MISMATCH("kotlin/Function2<@Ann() kotlin/Int, @Ann() kotlin/Int, kotlin/Unit>; kotlin/Function1<@Ann() kotlin/Int, kotlin/Unit>")!>{ single -> }<!>
+val test4 = f4 <!ARGUMENT_TYPE_MISMATCH("kotlin.Function2<@Ann() kotlin.Int, @Ann() kotlin.Int, kotlin.Unit>; kotlin.Function1<@Ann() kotlin.Int, kotlin.Unit>")!>{ single -> }<!>
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
index 86c52246b29..ccb791d7b99 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
@@ -11,5 +11,5 @@ class C<T> {
 }
 
 fun test(a: C<out CharSequence>) {
-    a[1] = <!ARGUMENT_TYPE_MISMATCH("@A() CapturedType(out kotlin/CharSequence); kotlin/Int")!>25<!>
+    a[1] = <!ARGUMENT_TYPE_MISMATCH("@A() CapturedType(out kotlin.CharSequence); kotlin.Int")!>25<!>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
index eae1841cb4b..389254d615f 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
@@ -13,5 +13,5 @@ class C<T> {
 class Out<out F>
 
 fun test(a: C<out CharSequence>, y: Out<CharSequence>) {
-    a + <!ARGUMENT_TYPE_MISMATCH("Out<@A() CapturedType(out kotlin/CharSequence)>; Out<kotlin/CharSequence>")!>y<!>
+    a + <!ARGUMENT_TYPE_MISMATCH("Out<@A() CapturedType(out kotlin.CharSequence)>; Out<kotlin.CharSequence>")!>y<!>
 }
diff --git a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithParameterToUnitImplicitLiteralsCase.fir.kt b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithParameterToUnitImplicitLiteralsCase.fir.kt
index 2305aae5818..b0d5f7b0201 100644
--- a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithParameterToUnitImplicitLiteralsCase.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithParameterToUnitImplicitLiteralsCase.fir.kt
@@ -30,7 +30,7 @@ fun testYield() {
     val buildee = build {
         yield { val x: UserKlass = <!UNRESOLVED_REFERENCE!>it<!> }
     }
-    checkExactType<Buildee<(UserKlass) -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin/Function1<UserKlass, kotlin/Unit>>; Buildee<kotlin/Function0<kotlin/Unit>>")!>buildee<!>)
+    checkExactType<Buildee<(UserKlass) -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin.Function1<UserKlass, kotlin.Unit>>; Buildee<kotlin.Function0<kotlin.Unit>>")!>buildee<!>)
 }
 
 // test 2: PTV is in producing position (materialize-case)
@@ -42,5 +42,5 @@ fun testMaterialize() {
             materialize()
         )
     }
-    checkExactType<Buildee<(UserKlass) -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin/Function1<UserKlass, kotlin/Unit>>; Buildee<kotlin/Function0<kotlin/Unit>>")!>buildee<!>)
+    checkExactType<Buildee<(UserKlass) -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin.Function1<UserKlass, kotlin.Unit>>; Buildee<kotlin.Function0<kotlin.Unit>>")!>buildee<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithReceiverToUnitImplicitLiteralsCase.fir.kt b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithReceiverToUnitImplicitLiteralsCase.fir.kt
index 8105c92d023..f09df8ed6c0 100644
--- a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithReceiverToUnitImplicitLiteralsCase.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/FunctionWithReceiverToUnitImplicitLiteralsCase.fir.kt
@@ -30,7 +30,7 @@ fun testYield() {
     val buildee = build {
         yield { val x: UserKlass = this<!UNRESOLVED_LABEL!>@yield<!> }
     }
-    checkExactType<Buildee<UserKlass.() -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin/Function1<UserKlass, kotlin/Unit>>; Buildee<kotlin/Function0<kotlin/Unit>>")!>buildee<!>)
+    checkExactType<Buildee<UserKlass.() -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin.Function1<UserKlass, kotlin.Unit>>; Buildee<kotlin.Function0<kotlin.Unit>>")!>buildee<!>)
 }
 
 // test 2: PTV is in producing position (materialize-case)
@@ -42,5 +42,5 @@ fun testMaterialize() {
             materialize()
         )
     }
-    checkExactType<Buildee<UserKlass.() -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin/Function1<UserKlass, kotlin/Unit>>; Buildee<kotlin/Function0<kotlin/Unit>>")!>buildee<!>)
+    checkExactType<Buildee<UserKlass.() -> Unit>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin.Function1<UserKlass, kotlin.Unit>>; Buildee<kotlin.Function0<kotlin.Unit>>")!>buildee<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/NullableNothingNullLiteralMaterializeCase.fir.kt b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/NullableNothingNullLiteralMaterializeCase.fir.kt
index df093193c1c..cb61d49628d 100644
--- a/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/NullableNothingNullLiteralMaterializeCase.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/oneParameter/oneTypeVariable/oneTypeInfoOrigin/targetTypes/NullableNothingNullLiteralMaterializeCase.fir.kt
@@ -27,5 +27,5 @@ fun testMaterialize() {
     val buildee = build {
         shareTypeInfo(null, materialize())
     }
-    checkExactType<Buildee<Nothing?>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin/Nothing?>; Buildee<kotlin/Nothing>")!>buildee<!>)
+    checkExactType<Buildee<Nothing?>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<kotlin.Nothing?>; Buildee<kotlin.Nothing>")!>buildee<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.fir.diag.txt
index f0060f7da9a..1326d47b26c 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461.fir.diag.txt
@@ -1 +1 @@
-/kt45461.kt:(245,252): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
+/kt45461.kt:(245,252): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin.String, kotlin.Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.fir.diag.txt
index 8f4b786dc72..ce8f1f87625 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_12.fir.diag.txt
@@ -1 +1 @@
-/kt45461_12.kt:(296,303): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
+/kt45461_12.kt:(296,303): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin.String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt
index 73dbf405a49..ef8378a113e 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_2.fir.diag.txt
@@ -1,3 +1,3 @@
-/kt45461_2.kt:(198,201): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.
+/kt45461_2.kt:(198,201): warning: Type 'kotlin.Int' is final, so the value of the type parameter is predetermined.
 
-/kt45461_2.kt:(253,260): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0.
+/kt45461_2.kt:(253,260): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin.String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt
index e4442459941..5633a09d4f5 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.diag.txt
@@ -1,5 +1,5 @@
-/kt45461_25.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.
+/kt45461_25.fir.kt:(176,180): warning: Unchecked cast of 'kotlin.Nothing?' to 'S'.
 
-/kt45461_25.fir.kt:(206,209): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.
+/kt45461_25.fir.kt:(206,209): warning: Type 'kotlin.Int' is final, so the value of the type parameter is predetermined.
 
-/kt45461_25.fir.kt:(276,283): error: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int).
+/kt45461_25.fir.kt:(276,283): error: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin.String, K (multiple incompatible classes: kotlin/String, kotlin/Int).
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.kt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.kt
index e423e760874..df8eb2a1077 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_25.fir.kt
@@ -8,5 +8,5 @@ class Bar<T> {
 
 fun <K : L, L : N, N: <!FINAL_UPPER_BOUND!>Int<!>> main() {
     val foo = Foo<K>()
-    val x: Float = Bar<String>().<!INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION_ERROR("S; kotlin/String, K; multiple incompatible classes; : kotlin/String, kotlin/Int")!>takeFoo<!>(foo) // error in 1.3.72, no error in 1.4.31
+    val x: Float = Bar<String>().<!INFERRED_TYPE_VARIABLE_INTO_EMPTY_INTERSECTION_ERROR("S; kotlin.String, K; multiple incompatible classes; : kotlin/String, kotlin/Int")!>takeFoo<!>(foo) // error in 1.3.72, no error in 1.4.31
 }
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_26.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_26.fir.diag.txt
index f4cb7e3cdce..0d982afe6be 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_26.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_26.fir.diag.txt
@@ -1,3 +1,3 @@
-/kt45461_26.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.
+/kt45461_26.fir.kt:(176,180): warning: Unchecked cast of 'kotlin.Nothing?' to 'S'.
 
-/kt45461_26.fir.kt:(224,232): warning: Type 'Out<kotlin/Int>' is final, so the value of the type parameter is predetermined.
+/kt45461_26.fir.kt:(224,232): warning: Type 'Out<kotlin.Int>' is final, so the value of the type parameter is predetermined.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.fir.diag.txt
index 6278a2b2dd8..4ed4814f2b0 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt45461_5.fir.diag.txt
@@ -1 +1 @@
-/kt45461_5.kt:(269,276): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
+/kt45461_5.kt:(269,276): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin.String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt
index 34d616c615c..993905c8749 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt48765.fir.diag.txt
@@ -1,5 +1,5 @@
-/kt48765.kt:(282,285): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Number (multiple incompatible classes). This will become an error in Kotlin 2.0.
+/kt48765.kt:(282,285): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: kotlin.String, kotlin.Number (multiple incompatible classes). This will become an error in Kotlin 2.0.
 
-/kt48765.kt:(345,351): warning: Type 'kotlin/String' is final, so the value of the type parameter is predetermined.
+/kt48765.kt:(345,351): warning: Type 'kotlin.String' is final, so the value of the type parameter is predetermined.
 
-/kt48765.kt:(379,383): warning: Unchecked cast of 'kotlin/String' to 'T'.
+/kt48765.kt:(379,383): warning: Unchecked cast of 'kotlin.String' to 'T'.
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.fir.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.fir.diag.txt
index 1a14910b505..b39adeec356 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/kt49661.fir.diag.txt
@@ -1 +1 @@
-/kt49661.fir.kt:(243,244): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: Foo, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
+/kt49661.fir.kt:(243,244): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: Foo, kotlin.Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
diff --git a/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.diag.txt b/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.diag.txt
index 77313e4dded..974ad9eb4af 100644
--- a/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/j+k/types/notNullTypeParameterWithKotlinNullableWarnings.fir.diag.txt
@@ -1,7 +1,7 @@
 /main.kt:(98,103): error: Argument type mismatch: actual type is 'V', but 'V & Any' was expected.
 
-/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'kotlin/collections/(Mutable)List<@NotNull() V & Any>' was expected.
+/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin.collections.List<V>', but 'kotlin.collections.(Mutable)List<@NotNull() V & Any>' was expected.
 
 /main.kt:(133,138): error: Argument type mismatch: actual type is 'V', but 'E & Any' was expected.
 
-/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'kotlin/collections/(Mutable)List<@NotNull() E & Any>' was expected.
+/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin.collections.List<V>', but 'kotlin.collections.(Mutable)List<@NotNull() E & Any>' was expected.
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/kt58844.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/kt58844.fir.kt
index f0ec03ad5c5..3373bca2952 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/kt58844.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/kt58844.fir.kt
@@ -7,6 +7,6 @@ fun main(args: Array<String>) {
     var intVar: Int? = 1
     var byteVar: Byte? = 1
 
-    intFun(<!ARGUMENT_TYPE_MISMATCH("kotlin/Int; kotlin/Int?")!>intVar?.toInt()<!>)
-    byteFun(<!ARGUMENT_TYPE_MISMATCH("kotlin/Byte; kotlin/Byte?")!>byteVar?.toByte()<!>)
+    intFun(<!ARGUMENT_TYPE_MISMATCH("kotlin.Int; kotlin.Int?")!>intVar?.toInt()<!>)
+    byteFun(<!ARGUMENT_TYPE_MISMATCH("kotlin.Byte; kotlin.Byte?")!>byteVar?.toByte()<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
index 26b4b3aa49e..2f8baccebb8 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
@@ -5,7 +5,7 @@ class A() {
             field = <!ASSIGNMENT_TYPE_MISMATCH!>value<!>
         }
     val y: Int
-        get(): <!WRONG_GETTER_RETURN_TYPE("kotlin/Int; kotlin/String")!>String<!> = "s"
+        get(): <!WRONG_GETTER_RETURN_TYPE("kotlin.Int; kotlin.String")!>String<!> = "s"
     val z: Int
         get() {
             return <!RETURN_TYPE_MISMATCH!>"s"<!>
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
index 150646a4e85..ea0ea232e23 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
@@ -13,7 +13,7 @@ fun testElvis(a: Int?, b: Int?) {
     if (a != null) {
         doInt(b ?: a)
     }
-    <!INFERRED_TYPE_VARIABLE_INTO_POSSIBLE_EMPTY_INTERSECTION("T; a/A, kotlin/Int; final class and interface")!>doList<!>(getList() ?: emptyListOfA()) //should be an error
+    <!INFERRED_TYPE_VARIABLE_INTO_POSSIBLE_EMPTY_INTERSECTION("T; a.A, kotlin.Int; final class and interface")!>doList<!>(getList() ?: emptyListOfA()) //should be an error
     doList(getList() ?: strangeList { doInt(it) }) //lambda was not analyzed
 }
 
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
index 97b79ee6dbd..c4e848b8147 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
@@ -12,7 +12,7 @@ fun <T: A> emptyNullableListOfA(): List<T>? = null
 //-------------------------------
 
 fun testExclExcl() {
-    <!INFERRED_TYPE_VARIABLE_INTO_POSSIBLE_EMPTY_INTERSECTION("T; a/A, kotlin/Int; final class and interface")!>doList<!>(emptyNullableListOfA()!!) //should be an error here
+    <!INFERRED_TYPE_VARIABLE_INTO_POSSIBLE_EMPTY_INTERSECTION("T; a.A, kotlin.Int; final class and interface")!>doList<!>(emptyNullableListOfA()!!) //should be an error here
     val l: List<Int> = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<a.A & kotlin.Int>")!>id(<!INFERRED_TYPE_VARIABLE_INTO_POSSIBLE_EMPTY_INTERSECTION!>emptyNullableListOfA<!>()!!)<!>
 
     doList(strangeNullableList { doInt(it) }!!) //lambda should be analyzed (at completion phase)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/smartCastOnAlienPropertyFromInvisibleClass.fir.diag.txt b/compiler/testData/diagnostics/tests/smartCasts/smartCastOnAlienPropertyFromInvisibleClass.fir.diag.txt
index ed26888e901..2077d0bf438 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/smartCastOnAlienPropertyFromInvisibleClass.fir.diag.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/smartCastOnAlienPropertyFromInvisibleClass.fir.diag.txt
@@ -1,3 +1,3 @@
-/B.kt:(133,134): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.
+/B.kt:(133,134): error: Smart cast to 'kotlin.String' is impossible, because 'x' is a public API property declared in different module.
 
-/B.kt:(265,268): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.
+/B.kt:(265,268): error: Smart cast to 'kotlin.String' is impossible, because 'x' is a public API property declared in different module.
diff --git a/compiler/testData/diagnostics/tests/typeParameters/typeMismatchErrorHasExpectedGenericTypeArgumentInsteadOfTypeParameter.fir.kt b/compiler/testData/diagnostics/tests/typeParameters/typeMismatchErrorHasExpectedGenericTypeArgumentInsteadOfTypeParameter.fir.kt
index 376412574e2..93f25aa5656 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/typeMismatchErrorHasExpectedGenericTypeArgumentInsteadOfTypeParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/typeMismatchErrorHasExpectedGenericTypeArgumentInsteadOfTypeParameter.fir.kt
@@ -5,7 +5,7 @@
 fun <T> foo(it: @kotlin.internal.Exact T) {}
 
 fun main() {
-    foo<Any>(<!ARGUMENT_TYPE_MISMATCH("kotlin/Any; kotlin/String")!>""<!>)
+    foo<Any>(<!ARGUMENT_TYPE_MISMATCH("kotlin.Any; kotlin.String")!>""<!>)
 }
 
 interface I
diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/upperBoundViolated2.fir.diag.txt b/compiler/testData/diagnostics/testsWithStdLib/typealias/upperBoundViolated2.fir.diag.txt
index b206278568f..e1906e36815 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/typealias/upperBoundViolated2.fir.diag.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/upperBoundViolated2.fir.diag.txt
@@ -1 +1 @@
-/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin/collections/List<kotlin/CharSequence>'.
+/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin.collections.List<kotlin.CharSequence>'.
diff --git a/compiler/testData/integration/ant/jvm/wrongCallForCollectionLiteral/build.log.expected b/compiler/testData/integration/ant/jvm/wrongCallForCollectionLiteral/build.log.expected
index 5089b9c26e8..a1eba7a6e39 100644
--- a/compiler/testData/integration/ant/jvm/wrongCallForCollectionLiteral/build.log.expected
+++ b/compiler/testData/integration/ant/jvm/wrongCallForCollectionLiteral/build.log.expected
@@ -5,10 +5,10 @@ build:
     [mkdir] Created dir: [Temp]/classes
     [javac] Compiling 2 source files to [Temp]/classes
     [javac] Compiling [[TestData]] => [[Temp]/classes]
-    [javac] [TestData]/literals.kt:6:9: error: argument type mismatch: actual type is 'kotlin/FloatArray', but 'kotlin/IntArray' was expected.
+    [javac] [TestData]/literals.kt:6:9: error: argument type mismatch: actual type is 'kotlin.FloatArray', but 'kotlin.IntArray' was expected.
     [javac] @AnnInt([1, 2])
     [javac]         ^
-    [javac] [TestData]/literals.kt:9:9: error: argument type mismatch: actual type is 'kotlin/FloatArray', but 'kotlin/IntArray' was expected.
+    [javac] [TestData]/literals.kt:9:9: error: argument type mismatch: actual type is 'kotlin.FloatArray', but 'kotlin.IntArray' was expected.
     [javac] @AnnInt(intArrayOf(1, 2))
     [javac]         ^
 
diff --git a/plugins/assign-plugin/testData/diagnostics/localVariables.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/localVariables.fir.diag.txt
index 10fe0e6c101..831715bbf68 100644
--- a/plugins/assign-plugin/testData/diagnostics/localVariables.fir.diag.txt
+++ b/plugins/assign-plugin/testData/diagnostics/localVariables.fir.diag.txt
@@ -1,13 +1,13 @@
 /localVariables.fir.kt:(401,409): error: 'val' cannot be reassigned.
 
-/localVariables.fir.kt:(412,418): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.
+/localVariables.fir.kt:(412,418): error: Assignment type mismatch: actual type is 'kotlin.String', but 'StringProperty' was expected.
 
 /localVariables.fir.kt:(521,529): error: 'val' cannot be reassigned.
 
-/localVariables.fir.kt:(673,679): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.
+/localVariables.fir.kt:(673,679): error: Assignment type mismatch: actual type is 'kotlin.String', but 'StringProperty' was expected.
 
 /localVariables.fir.kt:(917,925): error: 'val' cannot be reassigned.
 
-/localVariables.fir.kt:(928,934): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.
+/localVariables.fir.kt:(928,934): error: Assignment type mismatch: actual type is 'kotlin.String', but 'StringProperty' was expected.
 
 /localVariables.fir.kt:(995,1003): error: 'val' cannot be reassigned.
diff --git a/plugins/assign-plugin/testData/diagnostics/methodDeclaration.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/methodDeclaration.fir.diag.txt
index bff1b95fe6a..07f56202f78 100644
--- a/plugins/assign-plugin/testData/diagnostics/methodDeclaration.fir.diag.txt
+++ b/plugins/assign-plugin/testData/diagnostics/methodDeclaration.fir.diag.txt
@@ -10,4 +10,4 @@
 
 /methodDeclaration.fir.kt:(870,875): error: 'val' cannot be reassigned.
 
-/methodDeclaration.fir.kt:(878,880): error: Assignment type mismatch: actual type is 'kotlin/Int', but '<local>/IntProperty' was expected.
+/methodDeclaration.fir.kt:(878,880): error: Assignment type mismatch: actual type is 'kotlin.Int', but '<local>.IntProperty' was expected.
diff --git a/plugins/assign-plugin/testData/diagnostics/noAnnotation.fir.diag.txt b/plugins/assign-plugin/testData/diagnostics/noAnnotation.fir.diag.txt
index 067158246ac..e6b50922a43 100644
--- a/plugins/assign-plugin/testData/diagnostics/noAnnotation.fir.diag.txt
+++ b/plugins/assign-plugin/testData/diagnostics/noAnnotation.fir.diag.txt
@@ -1,19 +1,19 @@
 /noAnnotation.fir.kt:(424,429): error: 'val' cannot be reassigned.
 
-/noAnnotation.fir.kt:(432,436): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.
+/noAnnotation.fir.kt:(432,436): error: Assignment type mismatch: actual type is 'kotlin.String', but 'StringProperty' was expected.
 
 /noAnnotation.fir.kt:(446,451): error: 'val' cannot be reassigned.
 
 /noAnnotation.fir.kt:(500,505): error: 'val' cannot be reassigned.
 
-/noAnnotation.fir.kt:(508,512): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.
+/noAnnotation.fir.kt:(508,512): error: Assignment type mismatch: actual type is 'kotlin.String', but 'StringProperty' was expected.
 
 /noAnnotation.fir.kt:(544,549): error: 'val' cannot be reassigned.
 
 /noAnnotation.fir.kt:(588,593): error: 'val' cannot be reassigned.
 
-/noAnnotation.fir.kt:(596,598): error: Assignment type mismatch: actual type is 'kotlin/Int', but 'StringProperty' was expected.
+/noAnnotation.fir.kt:(596,598): error: Assignment type mismatch: actual type is 'kotlin.Int', but 'StringProperty' was expected.
 
 /noAnnotation.fir.kt:(624,629): error: 'val' cannot be reassigned.
 
-/noAnnotation.fir.kt:(632,634): error: Assignment type mismatch: actual type is 'kotlin/Int', but 'StringProperty' was expected.
+/noAnnotation.fir.kt:(632,634): error: Assignment type mismatch: actual type is 'kotlin.Int', but 'StringProperty' was expected.