diff --git a/compiler/testData/cli/jvm/conflictingOverloads.out b/compiler/testData/cli/jvm/conflictingOverloads.out
index ba95ccd2a0f..3083e2f81bc 100644
--- a/compiler/testData/cli/jvm/conflictingOverloads.out
+++ b/compiler/testData/cli/jvm/conflictingOverloads.out
@@ -1,7 +1,7 @@
-compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.collections.List<kotlin.Int>' conflicts with another declaration in package '<root>'
+compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): List<Int>' conflicts with another declaration in package '<root>'
 fun a(): List<Int> = null!!
 ^
-compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.collections.List<kotlin.String>' conflicts with another declaration in package '<root>'
+compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): List<String>' conflicts with another declaration in package '<root>'
 fun a(): List<String> = null!!
 ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/signatureClash.out b/compiler/testData/cli/jvm/signatureClash.out
index 4da783611e4..2f16dbdf465 100644
--- a/compiler/testData/cli/jvm/signatureClash.out
+++ b/compiler/testData/cli/jvm/signatureClash.out
@@ -1,46 +1,46 @@
 compiler/testData/cli/jvm/signatureClash.kt:6:5: error: accidental override: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): kotlin.Int
-    fun getX(): kotlin.Int
+    fun <get-x>(): Int
+    fun getX(): Int
     fun getX() = 1
     ^
 compiler/testData/cli/jvm/signatureClash.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
-    fun <get-a>(): kotlin.Int
-    fun getA(): kotlin.Int
+    fun <get-a>(): Int
+    fun getA(): Int
     fun getA(): Int = 1
     ^
 compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
-    fun <get-a>(): kotlin.Int
-    fun getA(): kotlin.Int
+    fun <get-a>(): Int
+    fun getA(): Int
     val a: Int = 1
     ^
 compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
-    fun <get-b>(): kotlin.Int
-    fun getB(): kotlin.Int
+    fun <get-b>(): Int
+    fun getB(): Int
 fun getB(): Int = 1
 ^
 compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
-    fun <get-b>(): kotlin.Int
-    fun getB(): kotlin.Int
+    fun <get-b>(): Int
+    fun getB(): Int
 val b: Int = 1
 ^
 compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
-    fun <get-tr>(): kotlin.Int
-    fun getTr(): kotlin.Int
+    fun <get-tr>(): Int
+    fun getTr(): Int
 class SubTr : Tr {
       ^
 compiler/testData/cli/jvm/signatureClash.kt:20:5: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
-    fun <get-tr>(): kotlin.Int
-    fun getTr(): kotlin.Int
+    fun <get-tr>(): Int
+    fun getTr(): Int
     val tr = 1
     ^
 compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
-    fun `access$f`(c: C): kotlin.Unit
-    fun f(): kotlin.Unit
+    fun `access$f`(c: C): Unit
+    fun f(): Unit
 class C {
       ^
 compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
-    fun `access$f`(c: C): kotlin.Unit
-    fun f(): kotlin.Unit
+    fun `access$f`(c: C): Unit
+    fun f(): Unit
     fun `access$f`(c: C) {}
     ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out
index 2ac05f8d22f..39c386c5063 100644
--- a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out
+++ b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out
@@ -1,71 +1,71 @@
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(a: A): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(a: A): Int
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(a: A, d: Int): Unit
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$cp`(): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$cp`(): Int
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$cp`(d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$cp`(d: Int): Unit
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
-    fun <get-bar>(): kotlin.Int
-    fun `access$getBar$lp`(a: A): kotlin.Int
+    fun <get-bar>(): Int
+    fun `access$getBar$lp`(a: A): Int
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(a: A): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(a: A): Int
     fun `access$getFoo$p`(a: A): Int = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(a: A, d: Int): Unit
     fun `access$setFoo$p`(a: A, d: Int) {}
     ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$cp`(): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$cp`(): Int
     fun `access$getFoo$cp`(): Int = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:10:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$cp`(d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$cp`(d: Int): Unit
     fun `access$setFoo$cp`(d: Int) {}
     ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:16:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
-    fun <get-bar>(): kotlin.Int
-    fun `access$getBar$lp`(a: A): kotlin.Int
+    fun <get-bar>(): Int
+    fun `access$getBar$lp`(a: A): Int
     fun `access$getBar$lp`(a: A): Int = 7
     ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(p: A.Companion): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(p: A.Companion): Int
     companion object {
               ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(p: A.Companion, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
     companion object {
               ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:28:9: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(p: A.Companion): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(p: A.Companion): Int
         fun `access$getFoo$p`(p: A.Companion): Int = 1
         ^
 compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:29:9: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(p: A.Companion, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
         fun `access$setFoo$p`(p: A.Companion, d: Int) {}
         ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out
index 9437ba8777c..a96828461ef 100644
--- a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out
+++ b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out
@@ -1,41 +1,41 @@
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(a: A): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(a: A): Int
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(a: A, d: Int): Unit
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
-    fun `access$getFoo`(a: A): kotlin.Int
-    fun getFoo(): kotlin.Int
+    fun `access$getFoo`(a: A): Int
+    fun getFoo(): Int
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
-    fun `access$setFoo`(a: A, d: kotlin.Int): kotlin.Unit
-    fun setFoo(i: kotlin.Int): kotlin.Unit
+    fun `access$setFoo`(a: A, d: Int): Unit
+    fun setFoo(i: Int): Unit
 class A {
       ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
-    fun <get-foo>(): kotlin.Int
-    fun `access$getFoo$p`(a: A): kotlin.Int
+    fun <get-foo>(): Int
+    fun `access$getFoo$p`(a: A): Int
     fun `access$getFoo$p`(a: A): Int = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
-    fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
+    fun <set-foo>(<set-?>: Int): Unit
+    fun `access$setFoo$p`(a: A, d: Int): Unit
     fun `access$setFoo$p`(a: A, d: Int) {}
     ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:11:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
-    fun `access$getFoo`(a: A): kotlin.Int
-    fun getFoo(): kotlin.Int
+    fun `access$getFoo`(a: A): Int
+    fun getFoo(): Int
     fun `access$getFoo`(a: A): Int = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:12:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
-    fun `access$setFoo`(a: A, d: kotlin.Int): kotlin.Unit
-    fun setFoo(i: kotlin.Int): kotlin.Unit
+    fun `access$setFoo`(a: A, d: Int): Unit
+    fun setFoo(i: Int): Unit
     fun `access$setFoo`(a: A, d: Int) {}
     ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out
index 04cd0caf5cd..7de74af5b5f 100644
--- a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out
+++ b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out
@@ -1,31 +1,31 @@
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V):
-    fun `access$foo`(d: Derived): kotlin.Unit
-    fun foo(): kotlin.Unit
+    fun `access$foo`(d: Derived): Unit
+    fun foo(): Unit
     private fun foo() {}
     ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I):
-    fun <get-bar>(): kotlin.Int
-    fun `access$getBar$p`(d: Derived): kotlin.Int
+    fun <get-bar>(): Int
+    fun `access$getBar$p`(d: Derived): Int
         get
         ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V):
-    fun <set-bar>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setBar$p`(d: Derived, i: kotlin.Int): kotlin.Unit
+    fun <set-bar>(<set-?>: Int): Unit
+    fun `access$setBar$p`(d: Derived, i: Int): Unit
         set
         ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I):
-    fun <get-baz>(): kotlin.Int
-    fun `access$getBaz$p`(d: Derived): kotlin.Int
+    fun <get-baz>(): Int
+    fun `access$getBaz$p`(d: Derived): Int
     private var baz = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I):
-    fun <get-boo>(): kotlin.Int
-    fun `access$getBoo$p`(d: Derived): kotlin.Int
+    fun <get-boo>(): Int
+    fun `access$getBoo$p`(d: Derived): Int
     private val boo = 1
     ^
 compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V):
-    fun <set-bar1>(<set-?>: kotlin.Int): kotlin.Unit
-    fun `access$setBar1$p`(d: Derived, i: kotlin.Int): kotlin.Unit
+    fun <set-bar1>(<set-?>: Int): Unit
+    fun `access$setBar1$p`(d: Derived, i: Int): Unit
         set
         ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.out b/compiler/testData/cli/jvm/wrongAbiVersion.out
index e30df808100..08ec72137d5 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.out
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.out
@@ -3,7 +3,7 @@ compiler/testData/cli/jvm/wrongAbiVersion.kt:4:5: error: unresolved reference: b
     bar()
     ^
 compiler/testData/cli/jvm/wrongAbiVersion.kt:6:7: error: unresolved reference. None of the following candidates is applicable because of receiver type mismatch:
-public fun kotlin.String.replaceIndent(newIndent: kotlin.String = ...): kotlin.String defined in kotlin.text
+public fun String.replaceIndent(newIndent: String = ...): String defined in kotlin.text
 (note: this may be caused by the fact that some classes compiled with an incompatible version of Kotlin were found in the classpath. Such classes cannot be loaded properly by this version of Kotlin compiler. See below for more information)
     1.replaceIndent(2, 3)
       ^
diff --git a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.kt b/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.kt
index 5842af1f97d..f611b9413b4 100644
--- a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.kt
+++ b/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.kt
@@ -4,10 +4,10 @@ fun foo(<!UNUSED_PARAMETER(IGNORE)!>u<!> : Unit) : Int = 1
 fun bas(<!UNUSED_PARAMETER!>u<!> : Pa<Int, String>) = 3
 
 fun test() : Int {
-    foo(<!CONSTANT_EXPECTED_TYPE_MISMATCH(IGNORE; kotlin.Unit)!>1<!>)
+    foo(<!CONSTANT_EXPECTED_TYPE_MISMATCH(IGNORE; Unit)!>1<!>)
     val <!UNUSED_VARIABLE!>a<!> : () -> Unit = {
     foo(<!CONSTANT_EXPECTED_TYPE_MISMATCH(integer; IGNORE)!>1<!>)
-    bas(<!CONSTANT_EXPECTED_TYPE_MISMATCH(integer; Pa<kotlin.Int, kotlin.String>)!>1<!>)
+    bas(<!CONSTANT_EXPECTED_TYPE_MISMATCH(integer; Pa<Int, String>)!>1<!>)
 }
 return 1 <!NONE_APPLICABLE!>-<!> "1"
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
index 69a771ca39b..77335c26321 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
@@ -1,3 +1,3 @@
-val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(getValue\(kotlin.Nothing?, kotlin.reflect.KProperty<*>\); A)!>A()<!>
+val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(getValue\(Nothing?, KProperty<*>\); A)!>A()<!>
 
 class A
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
index 092e7b4139d..9404ef16409 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
@@ -2,7 +2,7 @@
 
 import kotlin.reflect.KProperty
 
-var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(setValue\(kotlin.Nothing?, kotlin.reflect.KProperty<*>, kotlin.Int\); A)!>A()<!>
+var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(setValue\(Nothing?, KProperty<*>, Int\); A)!>A()<!>
 
 class A {
     operator fun getValue(t: Any?, p: KProperty<*>): Int {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
index d312d4d4e51..d6e21a735e3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
@@ -4,6 +4,6 @@ public @interface A {
 }
 
 // FILE: b.kt
-@A(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf(1, "b")<!>)
+@A(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(Array<out String>; IGNORE)!>arrayOf(1, "b")<!>)
 fun test() {
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
index 40e6133d414..79cf6184495 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
@@ -1,5 +1,5 @@
 annotation class B(vararg val args: String)
 
-@B(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(kotlin.Array<out kotlin.String>; IGNORE)!>arrayOf(1, "b")<!>)
+@B(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH(Array<out String>; IGNORE)!>arrayOf(1, "b")<!>)
 fun test() {
 }
diff --git a/compiler/testData/repl/analyzeErrors.repl b/compiler/testData/repl/analyzeErrors.repl
index ea310281ca9..3867a02111c 100644
--- a/compiler/testData/repl/analyzeErrors.repl
+++ b/compiler/testData/repl/analyzeErrors.repl
@@ -1,6 +1,6 @@
 >>> fun foo() = 765
 >>> foo(1)
-error: too many arguments for public final fun foo(): kotlin.Int defined in Line1
+error: too many arguments for public final fun foo(): Int defined in Line1
 foo(1)
     ^
 >>> foo()
diff --git a/idea/testData/checker/ReturnTypeMismatchOnOverride.kt b/idea/testData/checker/ReturnTypeMismatchOnOverride.kt
index 959470ad3f4..c0efea8cbc1 100644
--- a/idea/testData/checker/ReturnTypeMismatchOnOverride.kt
+++ b/idea/testData/checker/ReturnTypeMismatchOnOverride.kt
@@ -5,7 +5,7 @@ interface Base {
 }
 
 class Derived : Base {
-    override fun foo(): <error descr="[RETURN_TYPE_MISMATCH_ON_OVERRIDE] Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): kotlin.Int defined in Base'">String</error> = ""
-    override var bar: <error descr="[VAR_TYPE_MISMATCH_ON_OVERRIDE] Type of 'bar' doesn't match the type of the overridden var-property 'public abstract var bar: kotlin.Int defined in Base'">String</error> = ""
-    override val qux: <error descr="[PROPERTY_TYPE_MISMATCH_ON_OVERRIDE] Type of 'qux' is not a subtype of the overridden property 'public abstract val qux: kotlin.Int defined in Base'">String</error> = ""
+    override fun foo(): <error descr="[RETURN_TYPE_MISMATCH_ON_OVERRIDE] Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): Int defined in Base'">String</error> = ""
+    override var bar: <error descr="[VAR_TYPE_MISMATCH_ON_OVERRIDE] Type of 'bar' doesn't match the type of the overridden var-property 'public abstract var bar: Int defined in Base'">String</error> = ""
+    override val qux: <error descr="[PROPERTY_TYPE_MISMATCH_ON_OVERRIDE] Type of 'qux' is not a subtype of the overridden property 'public abstract val qux: Int defined in Base'">String</error> = ""
 }
\ No newline at end of file
diff --git a/idea/testData/checker/SafeInvoke.kt b/idea/testData/checker/SafeInvoke.kt
index 8cb11f1301d..b2dd94c3b95 100644
--- a/idea/testData/checker/SafeInvoke.kt
+++ b/idea/testData/checker/SafeInvoke.kt
@@ -2,7 +2,7 @@ class Rule(val apply: () -> Unit)
 
 fun foo() {
     val rule: Rule? = Rule { }
-    rule?.<error descr="[UNSAFE_IMPLICIT_INVOKE_CALL] Reference has a nullable type (() -> kotlin.Unit)?, use explicit ?.invoke() to make function-like call instead">apply</error>()
+    rule?.<error descr="[UNSAFE_IMPLICIT_INVOKE_CALL] Reference has a nullable type (() -> Unit)?, use explicit ?.invoke() to make function-like call instead">apply</error>()
     val apply = rule?.apply
-    <error descr="[UNSAFE_IMPLICIT_INVOKE_CALL] Reference has a nullable type (() -> kotlin.Unit)?, use explicit ?.invoke() to make function-like call instead">apply</error>()
+    <error descr="[UNSAFE_IMPLICIT_INVOKE_CALL] Reference has a nullable type (() -> Unit)?, use explicit ?.invoke() to make function-like call instead">apply</error>()
 }
\ No newline at end of file
diff --git a/idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt.fragment b/idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt.fragment
index b30f967f487..6a6efb1f7d5 100644
--- a/idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt.fragment
+++ b/idea/testData/checker/codeFragments/classHeaderWithTypeArguments.kt.fragment
@@ -1 +1 @@
-this.foo(<error descr="[TYPE_MISMATCH] Type mismatch: inferred type is kotlin.String but T was expected">"a"</error>)
\ No newline at end of file
+this.foo(<error descr="[TYPE_MISMATCH] Type mismatch: inferred type is String but T was expected">"a"</error>)
\ No newline at end of file
diff --git a/idea/testData/checker/infos/SmartCasts.kt b/idea/testData/checker/infos/SmartCasts.kt
index 4f0ec598eae..8ff8a115325 100644
--- a/idea/testData/checker/infos/SmartCasts.kt
+++ b/idea/testData/checker/infos/SmartCasts.kt
@@ -153,13 +153,13 @@ fun getStringLength(obj : Any) : Char? {
 fun toInt(i: Int?): Int = if (i != null) <info descr="Smart cast to kotlin.Int">i</info> else 0
 fun illegalWhenBody(a: Any): Int = when(a) {
     is Int -> <info descr="Smart cast to kotlin.Int">a</info>
-    is String -> <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is kotlin.Any but kotlin.Int was expected">a</error>
+    is String -> <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is Any but Int was expected">a</error>
     else -> 1
 }
 fun illegalWhenBlock(a: Any): Int {
     when(a) {
         is Int -> return <info descr="Smart cast to kotlin.Int">a</info>
-        is String -> return <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is kotlin.Any but kotlin.Int was expected">a</error>
+        is String -> return <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is Any but Int was expected">a</error>
         else -> return 1
     }
 }
@@ -218,9 +218,9 @@ fun f(): String {
         <info descr="Smart cast to kotlin.String"><info descr="Wrapped into a reference object to be modified when captured in a closure">a</info></info>.compareTo("f")
         val <warning>f</warning>: Function0<String> = {
             <info>a</info> = 42
-            <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is kotlin.Any but kotlin.String was expected">a</error>
+            <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is Any but String was expected">a</error>
         }
-        return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'kotlin.String' is impossible, because 'a' is a local variable that is captured by a changing closure">a</error>
+        return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'String' is impossible, because 'a' is a local variable that is captured by a changing closure">a</error>
     }
     return ""
 }
@@ -232,13 +232,13 @@ class Mutable(var <info descr="This property has a backing field">x</info>: Stri
 
     fun foo(): String {
         if (x is String) {
-            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'kotlin.String' is impossible, because 'x' is a mutable property that could have been changed by this time">x</error>
+            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'String' is impossible, because 'x' is a mutable property that could have been changed by this time">x</error>
         }
         if (x != null) {
-            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'kotlin.String' is impossible, because 'x' is a mutable property that could have been changed by this time">x</error>
+            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'String' is impossible, because 'x' is a mutable property that could have been changed by this time">x</error>
         }
         if (xx is String) {
-            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'kotlin.String' is impossible, because 'xx' is a property that has open or custom getter">xx</error>
+            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'String' is impossible, because 'xx' is a property that has open or custom getter">xx</error>
         }
         return ""
     }
@@ -246,7 +246,7 @@ class Mutable(var <info descr="This property has a backing field">x</info>: Stri
     fun bar(other: Mutable): String {
         var y = other
         if (y.x is String) {
-            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'kotlin.String' is impossible, because 'y.x' is a complex expression">y.x</error>
+            return <error descr="[SMARTCAST_IMPOSSIBLE] Smart cast to 'String' is impossible, because 'y.x' is a complex expression">y.x</error>
         }
         return ""
     }
diff --git a/idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after b/idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
index 278b8738ab4..ce5752c22d0 100644
--- a/idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
@@ -1,5 +1,5 @@
-// ERROR: 'public open fun foo(): kotlin.Unit' conflicts with another declaration in class 'C'
-// ERROR: 'public open fun foo(): kotlin.Unit' conflicts with another declaration in class 'C'
+// ERROR: 'public open fun foo(): Unit' conflicts with another declaration in class 'C'
+// ERROR: 'public open fun foo(): Unit' conflicts with another declaration in class 'C'
 interface I {
     open fun foo(){}
 }
diff --git a/idea/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt b/idea/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
index 4e12f9f268a..ebef273b4fb 100644
--- a/idea/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
+++ b/idea/testData/copyPaste/imports/AlreadyImportedViaStar.expected.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.Unit but a.A was expected
+// ERROR: Type mismatch: inferred type is Unit but A was expected
 package to
 
 import a.*
diff --git a/idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt b/idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
index 9a2bc1fd344..d7e34714f50 100644
--- a/idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
+++ b/idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.Unit but d.A was expected
+// ERROR: Type mismatch: inferred type is Unit but A was expected
 package to
 
 import d.A
diff --git a/idea/testData/copyPaste/imports/ImportDependency.expected.kt b/idea/testData/copyPaste/imports/ImportDependency.expected.kt
index 9a2bc1fd344..d7e34714f50 100644
--- a/idea/testData/copyPaste/imports/ImportDependency.expected.kt
+++ b/idea/testData/copyPaste/imports/ImportDependency.expected.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.Unit but d.A was expected
+// ERROR: Type mismatch: inferred type is Unit but A was expected
 package to
 
 import d.A
diff --git a/idea/testData/copyPaste/imports/JavaStaticViaClass.expected.kt b/idea/testData/copyPaste/imports/JavaStaticViaClass.expected.kt
index 06560eb2735..18288121ee2 100644
--- a/idea/testData/copyPaste/imports/JavaStaticViaClass.expected.kt
+++ b/idea/testData/copyPaste/imports/JavaStaticViaClass.expected.kt
@@ -1,4 +1,4 @@
-// ERROR: Expression 'staticField' of type 'kotlin.Int' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'staticField' of type 'Int' cannot be invoked as a function. The function invoke() is not found
 package to
 
 import a.JavaF
diff --git a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt
index 4cdac29413c..7e0e71dab0b 100644
--- a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt
+++ b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.Unit but to.A was expected
+// ERROR: Type mismatch: inferred type is Unit but A was expected
 // ERROR: Function 'ext' must have a body
 package to
 
diff --git a/idea/testData/intentions/addNameToArgument/ambiguousCall.kt b/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
index 4319f1a9487..70d5f2aea80 100644
--- a/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
+++ b/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: kotlin.String, b: kotlin.Boolean, c: kotlin.Char): kotlin.Unit defined in root package<br>public fun foo(s: kotlin.String, b: kotlin.Boolean, p: kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package
 fun foo(s: String, b: Boolean, p: Int){}
 fun foo(s: String, b: Boolean, c: Char){}
 
diff --git a/idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt b/idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt
index 1f5ac0de4f2..7052781ca46 100644
--- a/idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt
+++ b/idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // IS_APPLICABLE: false
-// ERROR: Type mismatch: inferred type is kotlin.Int but kotlin.Boolean was expected
-// ERROR: Condition must be of type kotlin.Boolean, but is of type kotlin.Int
+// ERROR: Type mismatch: inferred type is Int but Boolean was expected
+// ERROR: Condition must be of type Boolean, but is of type Int
 // ERROR: Infix call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'. Use ?.-qualified call instead
 
 fun String?.times(a: Int): Boolean = a == 0
diff --git a/idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt b/idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt
index f348030d0ca..68a98e799db 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt
+++ b/idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
-// ERROR: Type mismatch: inferred type is kotlin.Int but kotlin.Boolean was expected
-// ERROR: Condition must be of type kotlin.Boolean, but is of type kotlin.Int
+// ERROR: Type mismatch: inferred type is Int but Boolean was expected
+// ERROR: Condition must be of type Boolean, but is of type Int
 // ERROR: Infix call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'. Use ?.-qualified call instead
 
 fun main(args: Array<String>) {
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt
index 4a4e380e71e..1ae9ccd541d 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if<caret> {
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt
index 5fc8dcf9896..55734f7f3ce 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if (foo == null<caret>) {
diff --git a/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt b/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt
index 0802860f773..05ea5963aa6 100644
--- a/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt
+++ b/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt
@@ -1,5 +1,5 @@
-// ERROR: Expected condition of type kotlin.Boolean
-// ERROR: Expected condition of type kotlin.Boolean
+// ERROR: Expected condition of type Boolean
+// ERROR: Expected condition of type Boolean
 // SKIP_ERRORS_AFTER
 
 fun test(n: Int): String {
diff --git a/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt.after b/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt.after
index edb6bccf9d3..7fca7822f4f 100644
--- a/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt.after
+++ b/idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt.after
@@ -1,5 +1,5 @@
-// ERROR: Expected condition of type kotlin.Boolean
-// ERROR: Expected condition of type kotlin.Boolean
+// ERROR: Expected condition of type Boolean
+// ERROR: Expected condition of type Boolean
 // SKIP_ERRORS_AFTER
 
 fun test(n: Int): String {
diff --git a/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt b/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
index 8c9f424f4d5..dce348fe369 100644
--- a/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
+++ b/idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>@kotlin.internal.InlineOnly public inline fun assert(value: kotlin.Boolean): kotlin.Unit defined in kotlin<br>@kotlin.internal.InlineOnly public inline fun assert(value: kotlin.Boolean, lazyMessage: () -> kotlin.Any): kotlin.Unit defined in kotlin
+// ERROR: None of the following functions can be called with the arguments supplied: <br>@InlineOnly public inline fun assert(value: Boolean): Unit defined in kotlin<br>@InlineOnly public inline fun assert(value: Boolean, lazyMessage: () -> Any): Unit defined in kotlin
 
 fun foo() {
     <caret>assert()
diff --git a/idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt b/idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt
index b2c10fb2843..220299cfeae 100644
--- a/idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt
+++ b/idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt
@@ -1,4 +1,4 @@
-// ERROR: Too many arguments for public final fun foo(): kotlin.Boolean defined in A
+// ERROR: Too many arguments for public final fun foo(): Boolean defined in A
 // SHOULD_FAIL_WITH: Call with arguments will be skipped: foo(2)
 class A(val n: Int) {
     fun <caret>foo(): Boolean = n > 1
diff --git a/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt b/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt
index cea995f1316..540c7bb367a 100644
--- a/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt
+++ b/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 fun foo(a: Boolean, b: Boolean) : Boolean {
     return !<caret>(!a + b)
 }
diff --git a/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt
index 7a8bec60cae..d03e3f255a8 100644
--- a/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt
+++ b/idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): Int defined in B
 interface A {
     fun <caret>foo(): Int
 }
diff --git a/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt
index 5572887325f..4edd5ca9a14 100644
--- a/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt
+++ b/idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
 interface A {
     val <caret>foo: Int
 }
diff --git a/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt b/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt
index 5572887325f..4edd5ca9a14 100644
--- a/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt
+++ b/idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
 interface A {
     val <caret>foo: Int
 }
diff --git a/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt b/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt
index 92117bef95e..358aae2a368 100644
--- a/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt
+++ b/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt
@@ -1,7 +1,7 @@
 // INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
 // ERROR: Unresolved reference: unresolved
 
 import javax.swing.SwingUtilities
diff --git a/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after b/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after
index bd68b0dd642..337a0c101a0 100644
--- a/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after
+++ b/idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after
@@ -1,7 +1,7 @@
 // INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
 // ERROR: Unresolved reference: unresolved
 
 import javax.swing.SwingUtilities
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
index 552515ab0c6..5f87eac269c 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: kotlin.Int = ..., f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package<br>public fun bar(a: kotlin.Int, b: kotlin.Int, f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
index af2cf58e0eb..6ef205cc61d 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: kotlin.Int = ..., f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package<br>public fun bar(a: kotlin.Int, b: kotlin.Int, f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt
index 08e76baa1dd..7631549e12a 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: true
-// ERROR: Type mismatch: inferred type is () -> ??? but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is () -> ??? but Int was expected
 // ERROR: No value passed for parameter b
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
index 53ccd73d1fd..003077cd3c6 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: true
-// ERROR: Type mismatch: inferred type is () -> ??? but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is () -> ??? but Int was expected
 // ERROR: No value passed for parameter b
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
diff --git a/idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt b/idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt
index 45ba7dd11b5..fd71c096e20 100644
--- a/idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt
+++ b/idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public final fun foo(p: kotlin.Int): kotlin.Unit defined in B<br>public open fun foo(p: kotlin.String): kotlin.Unit defined in B
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public final fun foo(p: Int): Unit defined in B<br>public open fun foo(p: String): Unit defined in B
 
 open class B {
     open fun foo(p: String){}
diff --git a/idea/testData/intentions/specifyTypeExplicitly/publicMember.kt b/idea/testData/intentions/specifyTypeExplicitly/publicMember.kt
index 0fedb8070f7..a28db834f7b 100644
--- a/idea/testData/intentions/specifyTypeExplicitly/publicMember.kt
+++ b/idea/testData/intentions/specifyTypeExplicitly/publicMember.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // WITH_RUNTIME
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 
 class A {
     public fun <caret>foo() {
diff --git a/idea/testData/intentions/swapBinaryExpression/is.kt b/idea/testData/intentions/swapBinaryExpression/is.kt
index 4752f2d22dc..3ad48a4cd3d 100644
--- a/idea/testData/intentions/swapBinaryExpression/is.kt
+++ b/idea/testData/intentions/swapBinaryExpression/is.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // ERROR: 'if' must have both main and 'else' branches if used as an expression
-// ERROR: Expression 'if "test" is String' of type 'kotlin.Unit' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'if "test" is String' of type 'Unit' cannot be invoked as a function. The function invoke() is not found
 
 fun <T> doSomething(a: T) {}
 
diff --git a/idea/testData/quickfix/abstract/manyImpl.kt b/idea/testData/quickfix/abstract/manyImpl.kt
index 31abaa482ab..7ff6935649e 100644
--- a/idea/testData/quickfix/abstract/manyImpl.kt
+++ b/idea/testData/quickfix/abstract/manyImpl.kt
@@ -1,5 +1,5 @@
 // "Make 'A' abstract" "false"
-// ERROR: Class 'X' must override public open fun foo(): kotlin.Unit defined in X because it inherits many implementations of it
+// ERROR: Class 'X' must override public open fun foo(): Unit defined in X because it inherits many implementations of it
 // ACTION: Create test
 // ACTION: Make internal
 // ACTION: Make private
diff --git a/idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt b/idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt
index 8a1878ddafe..a475c3533a4 100644
--- a/idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt
+++ b/idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddGenericUpperBoundFix" "false"
-// ERROR: Type argument is not within its bounds: should be subtype of 'kotlin.Any'
+// ERROR: Type argument is not within its bounds: should be subtype of 'Any'
 
 fun <T : Any> foo() = 1
 
diff --git a/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt b/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt
index 93dac81f54f..51596d7aacd 100644
--- a/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt
+++ b/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt
@@ -1,5 +1,5 @@
 // "Add 'kotlin.Any' as upper bound for E" "true"
-// ERROR: Type parameter bound for U in fun <T : kotlin.Any, U : kotlin.Any> foo(x: T, y: U): kotlin.Int<br> is not satisfied: inferred type F is not a subtype of kotlin.Any
+// ERROR: Type parameter bound for U in fun <T : Any, U : Any> foo(x: T, y: U): Int<br> is not satisfied: inferred type F is not a subtype of Any
 
 fun <T : Any, U: Any> foo(x: T, y: U) = 1
 
diff --git a/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt.after b/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt.after
index bdda2a29111..dbdffbfa93b 100644
--- a/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt.after
+++ b/idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt.after
@@ -1,5 +1,5 @@
 // "Add 'kotlin.Any' as upper bound for E" "true"
-// ERROR: Type parameter bound for U in fun <T : kotlin.Any, U : kotlin.Any> foo(x: T, y: U): kotlin.Int<br> is not satisfied: inferred type F is not a subtype of kotlin.Any
+// ERROR: Type parameter bound for U in fun <T : Any, U : Any> foo(x: T, y: U): Int<br> is not satisfied: inferred type F is not a subtype of Any
 
 fun <T : Any, U: Any> foo(x: T, y: U) = 1
 
diff --git a/idea/testData/quickfix/autoImports/delegateExtensionBoth.test b/idea/testData/quickfix/autoImports/delegateExtensionBoth.test
index 5e422d4e2f4..8a4bb7306e0 100644
--- a/idea/testData/quickfix/autoImports/delegateExtensionBoth.test
+++ b/idea/testData/quickfix/autoImports/delegateExtensionBoth.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -27,8 +27,8 @@ public operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProper
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/delegateExtensionGet.test b/idea/testData/quickfix/autoImports/delegateExtensionGet.test
index 3085c5522e7..a45a182d308 100644
--- a/idea/testData/quickfix/autoImports/delegateExtensionGet.test
+++ b/idea/testData/quickfix/autoImports/delegateExtensionGet.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -27,7 +27,7 @@ public operator fun <T> DelegateImpl<T>.getValue(thisRef: Any?, property: KPrope
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/delegateExtensionSet.test b/idea/testData/quickfix/autoImports/delegateExtensionSet.test
index 1d83d5ba9f8..7a8e051940d 100644
--- a/idea/testData/quickfix/autoImports/delegateExtensionSet.test
+++ b/idea/testData/quickfix/autoImports/delegateExtensionSet.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, kotlin.Int)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, Int)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -28,7 +28,7 @@ operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProperty<*>,
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, kotlin.Int)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, Int)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/delegateNoOperator.test b/idea/testData/quickfix/autoImports/delegateNoOperator.test
index c922d0a12ff..9af6d8f94b8 100644
--- a/idea/testData/quickfix/autoImports/delegateNoOperator.test
+++ b/idea/testData/quickfix/autoImports/delegateNoOperator.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Missing 'getValue(kotlin.Nothing?, kotlin.reflect.KProperty<*>)' method on delegate of type 'kotlin.String'
+// ERROR: Missing 'getValue(Nothing?, KProperty<*>)' method on delegate of type 'String'
 
 package b
 
diff --git a/idea/testData/quickfix/autoImports/invokeExtension.test b/idea/testData/quickfix/autoImports/invokeExtension.test
index 1b1a4efa588..def0d6438b7 100644
--- a/idea/testData/quickfix/autoImports/invokeExtension.test
+++ b/idea/testData/quickfix/autoImports/invokeExtension.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package testing
 
@@ -14,7 +14,7 @@ fun testing() {
 
 // FILE: second.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package some
 
@@ -26,7 +26,7 @@ operator fun Some.invoke(s: String) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
index 6dc952e29e4..82f6cd33630 100644
--- a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
+++ b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 // ACTION: Create extension function 'invoke'
 // ACTION: Create member function 'invoke'
 
@@ -17,7 +17,7 @@ fun testing() {
 
 // FILE: second.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package some
 
@@ -29,7 +29,7 @@ fun Some.invoke(s: String) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 // ACTION: Create extension function 'invoke'
 // ACTION: Create member function 'invoke'
 
diff --git a/idea/testData/quickfix/autoImports/minusOperator.after.kt b/idea/testData/quickfix/autoImports/minusOperator.after.kt
index aa150697b96..da0e69bbc1a 100644
--- a/idea/testData/quickfix/autoImports/minusOperator.after.kt
+++ b/idea/testData/quickfix/autoImports/minusOperator.after.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun kotlin.String.minus(i: java.lang.Integer): kotlin.String defined in h<br>public fun kotlin.String.minus(str: kotlin.String): kotlin.String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt b/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
index 26da1d16d1f..1fa15aff3ca 100644
--- a/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun kotlin.String.minus(i: java.lang.Integer): kotlin.String defined in h<br>public fun kotlin.String.minus(str: kotlin.String): kotlin.String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
index dd32b55ec14..d2f79e3a7f1 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -27,8 +27,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
index a0f7889149e..0130564e27c 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -36,8 +36,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
index c1ac432587b..52b1be7c4f8 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -35,8 +35,8 @@ operator fun Some.component1() = 1
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
index ac2f08ed5bc..0d7679abc9a 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -37,8 +37,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
index 0c99521c252..a783cbafee9 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 
 package testing
 
@@ -26,7 +26,7 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
index 5556fc67935..3d2325f887f 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -26,7 +26,7 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
index b14bd57a487..ed556cda66c 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ACTION: Create extension function 'component1'
 // ACTION: Create member function 'component1'
 
diff --git a/idea/testData/quickfix/autoImports/operatorAssignPlus.test b/idea/testData/quickfix/autoImports/operatorAssignPlus.test
index db97e003aab..61017efa81b 100644
--- a/idea/testData/quickfix/autoImports/operatorAssignPlus.test
+++ b/idea/testData/quickfix/autoImports/operatorAssignPlus.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -23,7 +23,7 @@ operator fun Some.plus(i: Int) : Some = this
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test b/idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test
index 8546f6f6be7..5b0a6bb909d 100644
--- a/idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test
+++ b/idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -23,7 +23,7 @@ operator fun Some.plusAssign(i: Int) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test b/idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
index 4db7761fec4..e186be20972 100644
--- a/idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
+++ b/idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -31,7 +31,7 @@ operator fun Some.plus(i: Int) : Some = this
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
diff --git a/idea/testData/quickfix/autoImports/plusOperator.after.kt b/idea/testData/quickfix/autoImports/plusOperator.after.kt
index 05cf55eb2a2..49dd3fdfb54 100644
--- a/idea/testData/quickfix/autoImports/plusOperator.after.kt
+++ b/idea/testData/quickfix/autoImports/plusOperator.after.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/plusOperator.before.Main.kt b/idea/testData/quickfix/autoImports/plusOperator.before.Main.kt
index 54c748ce7a5..1928d2de5c9 100644
--- a/idea/testData/quickfix/autoImports/plusOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/plusOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt b/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
index 0c8301cb8ac..0fd5dee3e71 100644
--- a/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
+++ b/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun h.A.unaryPlus(): kotlin.Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt b/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
index 1402dced7ff..c292bf352fe 100644
--- a/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun h.A.unaryPlus(): kotlin.Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
 
 package h
 
diff --git a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt
index a41b0d55e51..86a145d6fd2 100644
--- a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
-// ERROR: Too many arguments for public open operator fun equals(other: kotlin.Any?): kotlin.Boolean defined in kotlin.Any
+// ERROR: Too many arguments for public open operator fun equals(other: Any?): Boolean defined in kotlin.Any
 
 fun f(d: Any) {
     d.equals("a", <caret>"b")
diff --git a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
index b69c7577f90..d0f87c37811 100644
--- a/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
-// ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in java.lang.Object
+// ERROR: Too many arguments for public open fun equals(other: Any?): Boolean defined in java.lang.Object
 
 fun f(d: java.lang.Object) {
     d.equals("a", <caret>"b")
diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
index 29d63259b00..274c7f96087 100644
--- a/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
@@ -1,5 +1,5 @@
 // "Add parameter to function 'foo'" "true"
-// ERROR: Too many arguments for public fun foo(): kotlin.Unit defined in b
+// ERROR: Too many arguments for public fun foo(): Unit defined in b
 package a
 
 import b.foo
diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
index ebc8f773ee2..2bf4b229d1e 100644
--- a/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
@@ -1,5 +1,5 @@
 // "Add parameter to function 'foo'" "true"
-// ERROR: Too many arguments for public fun foo(): kotlin.Unit defined in b
+// ERROR: Too many arguments for public fun foo(): Unit defined in b
 package a
 
 import b.foo
diff --git a/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
index 8d04f7215a1..c22e5557653 100644
--- a/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
+++ b/idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false"
-//ERROR: Too many arguments for public final operator fun component1(): kotlin.Int defined in Data
+//ERROR: Too many arguments for public final operator fun component1(): Int defined in Data
 
 data class Data(val i: Int) {}
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt
index a7450449efc..83d6713c9ec 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt
@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "true"
-// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: kotlin.reflect.KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
+// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
 
 open class B
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
index 4470e6171ee..9fdd368955a 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt.after
@@ -1,7 +1,7 @@
 import kotlin.properties.ReadOnlyProperty
 
 // "Create class 'Foo'" "true"
-// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: kotlin.reflect.KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
+// ERROR: Class 'Foo' must be declared abstract or implement abstract member public abstract operator fun getValue(thisRef: A<T>, property: KProperty<*>): B defined in kotlin.properties.ReadOnlyProperty
 
 open class B
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt
index 86f59bb8543..e022d12783e 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt
@@ -2,7 +2,7 @@
 // ACTION: Create function 'Foo'
 // ACTION: Add parameter to constructor 'Foo'
 // ACTION: Create secondary constructor
-// ERROR: Too many arguments for public constructor Foo(a: kotlin.Int) defined in Foo
+// ERROR: Too many arguments for public constructor Foo(a: Int) defined in Foo
 
 class Foo(a: Int)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt
index 05f3ade49ca..b34a5413967 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt
@@ -1,5 +1,5 @@
 // "Create member function 'foo'" "true"
-// ERROR: Type mismatch: inferred type is A<kotlin.Int> but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 
 class A<T>(val n: T)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
index 70c538d1440..25c47ebd57e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
@@ -1,5 +1,5 @@
 // "Create member function 'foo'" "true"
-// ERROR: Type mismatch: inferred type is A<kotlin.Int> but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 
 class A<T>(val n: T) {
     fun foo(s: String, t: T): Any {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt
index a2f8b0b1224..6684bc679d0 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt
@@ -1,5 +1,5 @@
 // "Create member property 'foo'" "true"
-// ERROR: Type mismatch: inferred type is A<kotlin.Int> but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 // ERROR: Property must be initialized or be abstract
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after
index ec7436268a2..0d41703539d 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after
@@ -1,5 +1,5 @@
 // "Create member property 'foo'" "true"
-// ERROR: Type mismatch: inferred type is A<kotlin.Int> but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 // ERROR: Property must be initialized or be abstract
 
 class A<T>(val n: T) {
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
index 925fb8ade73..3786681cb41 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false"
-// ERROR: Too many arguments for @kotlin.Deprecated public fun oldFun(): kotlin.Unit defined in root package
+// ERROR: Too many arguments for @Deprecated public fun oldFun(): Unit defined in root package
 
 @Deprecated("", ReplaceWith("newFun()"))
 fun oldFun() {
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt
index 166f8d71eec..b4aa600a972 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false"
-// ERROR: The integer literal does not conform to the expected type kotlin.String
+// ERROR: The integer literal does not conform to the expected type String
 
 @Deprecated("", ReplaceWith("newFun()", imports = 123))
 fun oldFun() {
diff --git a/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt
index 373d108f3df..ec0a864d58d 100644
--- a/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt
+++ b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt
@@ -1,5 +1,5 @@
 // "Insert 'this()' call" "true"
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public constructor A(x: kotlin.Int) defined in A<br>public constructor A(x: kotlin.String) defined in A
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public constructor A(x: Int) defined in A<br>public constructor A(x: String) defined in A
 
 class A(val x: Int) {
     constructor(x: String)<caret>
diff --git a/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after
index a119f15997e..131a70a7264 100644
--- a/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after
+++ b/idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt.after
@@ -1,5 +1,5 @@
 // "Insert 'this()' call" "true"
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public constructor A(x: kotlin.Int) defined in A<br>public constructor A(x: kotlin.String) defined in A
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public constructor A(x: Int) defined in A<br>public constructor A(x: String) defined in A
 
 class A(val x: Int) {
     constructor(x: String) : this(<caret>)
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
index ca43952b1f9..e783be560b8 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
@@ -1,6 +1,6 @@
 // "Replace invalid positioned arguments for annotation" "true"
 // WITH_RUNTIME
 // ERROR: Only named arguments are available for Java annotations
-// ERROR: The integer literal does not conform to the expected type kotlin.String
+// ERROR: The integer literal does not conform to the expected type String
 
 @Ann(1, arg1 = 2) class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
index 9456b60bfa7..0934be03e79 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
@@ -1,6 +1,6 @@
 // "Replace invalid positioned arguments for annotation" "true"
 // WITH_RUNTIME
 // ERROR: Only named arguments are available for Java annotations
-// ERROR: The integer literal does not conform to the expected type kotlin.String
+// ERROR: The integer literal does not conform to the expected type String
 
 @Ann(1, 2<caret>) class A
diff --git a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
index 303a387fb31..9835de5b2dc 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt
@@ -1,7 +1,7 @@
 // "Make 'object : T {}' abstract" "false"
 // ACTION: Implement members
 // ACTION: Split property declaration
-// ERROR: Object must be declared abstract or implement abstract member public abstract fun foo(): kotlin.Unit defined in T
+// ERROR: Object must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T
 interface T {
     fun foo()
 }
diff --git a/idea/testData/quickfix/modifiers/noAbstractForObject.kt b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
index 368103dc207..373f5ced522 100644
--- a/idea/testData/quickfix/modifiers/noAbstractForObject.kt
+++ b/idea/testData/quickfix/modifiers/noAbstractForObject.kt
@@ -2,7 +2,7 @@
 // ACTION: Create test
 // ACTION: Implement members
 // ACTION: Move 'Some' to separate file
-// ERROR: Object 'Some' must be declared abstract or implement abstract member public abstract fun foo(): kotlin.Unit defined in T
+// ERROR: Object 'Some' must be declared abstract or implement abstract member public abstract fun foo(): Unit defined in T
 interface T {
     fun foo()
 }
diff --git a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt
index f95f375039b..f268e3f662b 100644
--- a/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt
+++ b/idea/testData/quickfix/override/implemenAsConstructorParameterFunction.kt
@@ -5,7 +5,7 @@
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Move 'A' to separate file
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): kotlin.Int defined in I
+// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun foo(): Int defined in I
 interface I {
     fun foo(): Int
 }
diff --git a/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt b/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt
index 88c72882fc6..9f2d1c08335 100644
--- a/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt
+++ b/idea/testData/quickfix/override/implemenAsConstructorParameterInObject.kt
@@ -4,7 +4,7 @@
 // ACTION: Make internal
 // ACTION: Make private
 // ACTION: Move 'A' to separate file
-// ERROR: Object 'A' must be declared abstract or implement abstract member public abstract val foo: kotlin.Int defined in I
+// ERROR: Object 'A' must be declared abstract or implement abstract member public abstract val foo: Int defined in I
 interface I {
     val foo: Int
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
index d20413a10f6..143dbcc2cf2 100644
--- a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt
@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: kotlin.String): kotlin.Unit defined in A
+// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A
 interface A {
     fun f(a: Int)
     fun f(a: String)
diff --git a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
index 1420715f3ba..141cdf7cf9c 100644
--- a/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
+++ b/idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt.after
@@ -1,5 +1,5 @@
 // "Change function signature..." "true"
-// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: kotlin.String): kotlin.Unit defined in A
+// ERROR: Class 'B' must be declared abstract or implement abstract member public abstract fun f(a: String): Unit defined in A
 interface A {
     fun f(a: Int)
     fun f(a: String)
diff --git a/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt
index 27586d3bd10..cbe2b99b915 100644
--- a/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt
@@ -1,5 +1,5 @@
 // "Change function signature to 'fun f(a: Int): Int'" "true"
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is String but Int was expected
 open class A {
     open fun f(a: Int): Int = 0
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after
index b5529cc6b12..d5ff10e00ca 100644
--- a/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after
+++ b/idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt.after
@@ -1,5 +1,5 @@
 // "Change function signature to 'fun f(a: Int): Int'" "true"
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is String but Int was expected
 open class A {
     open fun f(a: Int): Int = 0
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
index 2f98a344047..893fc8280a6 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt
@@ -1,6 +1,6 @@
 // "Change 'A.x' type to '(Int) -> Int'" "false"
 // ACTION: Change 'C.x' type to '(String) -> Int'
-// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (kotlin.String) -> kotlin.Int defined in A'
+// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (String) -> Int defined in A'
 interface A {
     val x: (String) -> Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
index 9e1f978fa6f..113219068dc 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false"
-// ERROR: Type of 'x' doesn't match the type of the overridden var-property 'public abstract var x: kotlin.Int defined in A'
+// ERROR: Type of 'x' doesn't match the type of the overridden var-property 'public abstract var x: Int defined in A'
 interface A {
     var x: Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
index 36afd0cf323..e816c04d94e 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false"
-// ERROR: Type of 'x' doesn't match the type of the overridden var-property 'public abstract var x: kotlin.String defined in A'
+// ERROR: Type of 'x' doesn't match the type of the overridden var-property 'public abstract var x: String defined in A'
 interface A {
     var x: String
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
index 2a5f1080b01..375ec53bb47 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.ChangeFunctionReturnTypeFix" "false"
-// ERROR: Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): kotlin.Int defined in A'
+// ERROR: Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): Int defined in A'
 interface A {
     fun foo(): Int
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
index 91ed00c9b69..962457d7ba2 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt
@@ -1,5 +1,5 @@
 // "Change 'prop' type to 'Int'" "true"
-// ERROR: Null can not be a value of a non-null type kotlin.Int
+// ERROR: Null can not be a value of a non-null type Int
 interface Test<T> {
     val prop : T
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
index b7010c03e4b..0aaa7117803 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt.after
@@ -1,5 +1,5 @@
 // "Change 'prop' type to 'Int'" "true"
-// ERROR: Null can not be a value of a non-null type kotlin.Int
+// ERROR: Null can not be a value of a non-null type Int
 interface Test<T> {
     val prop : T
 }
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
index 6b952efc236..ac3d0eb27a0 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt
@@ -1,7 +1,7 @@
 // "Change 'B.foo' function return type to 'Int'" "false"
 // "Change 'B.foo' function return type to 'Long'" "false"
 // "Remove explicitly specified return type" "false"
-// ERROR: Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): kotlin.Int defined in A'
+// ERROR: Return type of 'foo' is not a subtype of the return type of the overridden member 'public abstract fun foo(): Int defined in A'
 abstract class A {
     abstract fun foo() : Int;
 }
diff --git a/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
index b3bf71d985e..f687bfb0596 100644
--- a/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
+++ b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt
@@ -1,5 +1,5 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
-// ERROR: The integer literal does not conform to the expected type kotlin.String
+// ERROR: The integer literal does not conform to the expected type String
 
 @Suppress(1)
 fun foo(): String?<caret>? = null
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
index 8f42f01941f..269cb40657c 100644
--- a/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
+++ b/idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt.after
@@ -1,5 +1,5 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
-// ERROR: The integer literal does not conform to the expected type kotlin.String
+// ERROR: The integer literal does not conform to the expected type String
 
 @Suppress(1, "REDUNDANT_NULLABLE")
 fun foo(): String?<caret>? = null
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt b/idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt
index 6da549b4b59..c01e915b3ff 100644
--- a/idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt
+++ b/idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt
@@ -1,6 +1,6 @@
 // "Add non-null asserted (!!) call" "false"
 // ACTION: Change parameter 's' type of function 'other' to 'String?'
-// ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is String? but Int was expected
 fun test() {
     val s: String? = ""
     other(<caret>s)
diff --git a/idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt b/idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt
index e276811974b..f603de373d0 100644
--- a/idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt
+++ b/idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt
@@ -1,6 +1,6 @@
 // "Cast expression 'Foo<Number>()' to 'Foo<Int>'" "false"
 // ACTION: Create test
-// ERROR: Type mismatch: inferred type is Foo<kotlin.Number> but Foo<kotlin.Int> was expected
+// ERROR: Type mismatch: inferred type is Foo<Number> but Foo<Int> was expected
 class Foo<T>
 
 fun foo(): Foo<Int> {
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
index 825aa7343b1..2ef055dffd3 100644
--- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
+++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt
@@ -1,5 +1,5 @@
 // "Change 'A.component2' function return type to 'Unit'" "true"
-// ERROR: The integer literal does not conform to the expected type kotlin.Unit
+// ERROR: The integer literal does not conform to the expected type Unit
 abstract class A {
     abstract operator fun component1(): Int
     operator fun component2() = 42
diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
index 7ac9da58cae..1ed8adb056a 100644
--- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
+++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after
@@ -1,5 +1,5 @@
 // "Change 'A.component2' function return type to 'Unit'" "true"
-// ERROR: The integer literal does not conform to the expected type kotlin.Unit
+// ERROR: The integer literal does not conform to the expected type Unit
 abstract class A {
     abstract operator fun component1(): Int
     operator fun component2(): Unit = 42
diff --git a/idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
index be49fe674bb..6635d0742ee 100644
--- a/idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
+++ b/idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
@@ -1,6 +1,6 @@
 // "Change 'B.x' type to '(String) -> [ERROR : Ay]'" "false"
 // ACTION: Change 'A.x' type to '(Int) -> Int'
-// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (kotlin.String) -> [ERROR : Ay] defined in A'
+// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (String) -> [ERROR : Ay] defined in A'
 // ERROR: Unresolved reference: Ay
 interface A {
     val x: (String) -> Ay
diff --git a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
index 8d45a788ebf..5fe2f5ad27e 100644
--- a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
+++ b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
@@ -1,5 +1,5 @@
 // "Cast expression 'x' to 'List<Any>?'" "true"
-// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
+// ERROR: Java type mismatch expected (Mutable)List<Any!>! but found MutableList<String>. Use explicit cast
 
 fun main(x: MutableList<String>) {
     A.foo(x as List<Any>?)
diff --git a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
index 7fb864b7bd4..148a9a0fb0a 100644
--- a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
+++ b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
@@ -1,5 +1,5 @@
 // "Cast expression 'x' to 'List<Any>?'" "true"
-// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
+// ERROR: Java type mismatch expected (Mutable)List<Any!>! but found MutableList<String>. Use explicit cast
 
 fun main(x: MutableList<String>) {
     A.foo(<caret>x)
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt
index 7c50e9d07eb..dfde22c0556 100644
--- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt
+++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.ChangeParameterTypeFix" "false"
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is String but Int was expected
 interface A {
     fun f(i: Int): Boolean
 }
diff --git a/idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt b/idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt
index 12ca0e54226..528622d1109 100644
--- a/idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt
+++ b/idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt
@@ -1,5 +1,5 @@
 // "???" "false"
-//ERROR: Type mismatch: inferred type is kotlin.Array<out kotlin.Int> but kotlin.Array<out kotlin.String> was expected
+//ERROR: Type mismatch: inferred type is Array<out Int> but Array<out String> was expected
 
 //this test checks that there is no ArrayIndexOutOfBoundsException when there are more arguments than parameters
 fun <T> array1(vararg a : T) = a
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
index 19b6bd74d55..e8ec5d21f98 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
@@ -4,7 +4,7 @@
 // ACTION: Create enum 'NoSuchType'
 // ACTION: Create interface 'NoSuchType'
 // ACTION: Remove explicit lambda parameter types (may break code)
-// ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> kotlin.Int but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> Int but Int was expected
 // ERROR: Unresolved reference: NoSuchType
 
 fun foo(): Int {
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
index f997cc8f230..94e9588321a 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt
@@ -1,7 +1,7 @@
 // "Change 'AA.f' function return type to 'Boolean'" "false"
 // ACTION: Change 'AAA.g' function return type to 'Int'
 // ACTION: Convert to expression body
-// ERROR: Type mismatch: inferred type is kotlin.Int but kotlin.Boolean was expected
+// ERROR: Type mismatch: inferred type is Int but Boolean was expected
 interface A {
     fun f(): Int
 }
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
index 4ac9f26bf4e..580f21c92e8 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt
@@ -2,7 +2,7 @@
 // ACTION: Change 'AAA.g' function return type to 'Boolean'
 // ACTION: Convert to expression body
 // ACTION: Replace overloaded operator with function call
-// ERROR: Type mismatch: inferred type is kotlin.Boolean but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is Boolean but Int was expected
 interface A {
     operator fun contains(i: Int): Boolean
 }
diff --git a/idea/testData/quickfix/variables/changeToPropertyAccess/propertyCallWithArguments.kt b/idea/testData/quickfix/variables/changeToPropertyAccess/propertyCallWithArguments.kt
index 90c4d202ada..40b5c6be327 100644
--- a/idea/testData/quickfix/variables/changeToPropertyAccess/propertyCallWithArguments.kt
+++ b/idea/testData/quickfix/variables/changeToPropertyAccess/propertyCallWithArguments.kt
@@ -1,5 +1,5 @@
 // "Change to property access" "false"
-// ERROR: Expression 'fd' of type 'kotlin.String' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'fd' of type 'String' cannot be invoked as a function. The function invoke() is not found
 class A(val fd: String)
 
 fun x() {
diff --git a/j2k/testData/fileOrElement/class/kt-639.kt b/j2k/testData/fileOrElement/class/kt-639.kt
index 7317697d3cd..3c2b2a64e38 100644
--- a/j2k/testData/fileOrElement/class/kt-639.kt
+++ b/j2k/testData/fileOrElement/class/kt-639.kt
@@ -1,5 +1,5 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>(p0: kotlin.Int) Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>(p0: kotlin.Int) Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(p0: Int) Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(p0: Int) Please specify it explicitly.
 package demo
 
 import java.util.HashMap
diff --git a/j2k/testData/fileOrElement/comments/comments.kt b/j2k/testData/fileOrElement/comments/comments.kt
index 3d0d20cd3d8..eccc046c894 100644
--- a/j2k/testData/fileOrElement/comments/comments.kt
+++ b/j2k/testData/fileOrElement/comments/comments.kt
@@ -1,4 +1,4 @@
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): kotlin.Unit defined in java.lang.Runnable
+// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable
 package foo
 
 // we use package 'foo'
diff --git a/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt b/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt
index db7ba239de3..23a8c26caa6 100644
--- a/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt
+++ b/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.Any was expected
+// ERROR: Type mismatch: inferred type is String? but Any was expected
 internal class A {
     private val s: String? = null
 
diff --git a/j2k/testData/fileOrElement/function/java8Lambdas.kt b/j2k/testData/fileOrElement/function/java8Lambdas.kt
index c859748f29b..1fa9fce4d2c 100644
--- a/j2k/testData/fileOrElement/function/java8Lambdas.kt
+++ b/j2k/testData/fileOrElement/function/java8Lambdas.kt
@@ -1,9 +1,9 @@
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 class Java8Class {
     fun foo0(r: Function0<String>) {
     }
diff --git a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
index e632eaf672c..42692d3e808 100644
--- a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
+++ b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T> emptyList(): kotlin.collections.List<T> Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T> emptyList(): List<T> Please specify it explicitly.
 package test
 
 import java.util.Collections
diff --git a/j2k/testData/fileOrElement/issues/kt-1048.kt b/j2k/testData/fileOrElement/issues/kt-1048.kt
index 3e924538bd2..0722e9e63cc 100644
--- a/j2k/testData/fileOrElement/issues/kt-1048.kt
+++ b/j2k/testData/fileOrElement/issues/kt-1048.kt
@@ -1,5 +1,5 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
 import java.util.HashMap
 
 internal class G<T : String>(t: T)
diff --git a/j2k/testData/fileOrElement/issues/kt-807.kt b/j2k/testData/fileOrElement/issues/kt-807.kt
index b682691866f..613d7874cb7 100644
--- a/j2k/testData/fileOrElement/issues/kt-807.kt
+++ b/j2k/testData/fileOrElement/issues/kt-807.kt
@@ -1,5 +1,5 @@
-// ERROR: None of the following functions can be called with the arguments supplied:  public constructor FileInputStream(p0: [ERROR : Unresolved java classifier: FileDescriptor]!) defined in java.io.FileInputStream public constructor FileInputStream(p0: java.io.File!) defined in java.io.FileInputStream public constructor FileInputStream(p0: kotlin.String!) defined in java.io.FileInputStream
-// ERROR: Type mismatch: inferred type is java.io.DataInputStream but java.io.InputStream! was expected
+// ERROR: None of the following functions can be called with the arguments supplied:  public constructor FileInputStream(p0: [ERROR : Unresolved java classifier: FileDescriptor]!) defined in java.io.FileInputStream public constructor FileInputStream(p0: File!) defined in java.io.FileInputStream public constructor FileInputStream(p0: String!) defined in java.io.FileInputStream
+// ERROR: Type mismatch: inferred type is DataInputStream but InputStream! was expected
 // ERROR: Assignments are not expressions, and only expressions are allowed in this context
 // ERROR: Unresolved reference: close
 import java.io.*
diff --git a/j2k/testData/fileOrElement/list/Lists.kt b/j2k/testData/fileOrElement/list/Lists.kt
index 56455ceb7bc..aa36821cd11 100644
--- a/j2k/testData/fileOrElement/list/Lists.kt
+++ b/j2k/testData/fileOrElement/list/Lists.kt
@@ -1,6 +1,6 @@
 // ERROR: Unresolved reference: LinkedList
-// ERROR: Null can not be a value of a non-null type kotlin.Any
-// ERROR: Null can not be a value of a non-null type kotlin.Any
+// ERROR: Null can not be a value of a non-null type Any
+// ERROR: Null can not be a value of a non-null type Any
 import java.util.*
 
 class Lists {
diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
index a3dd2648978..d6b427c9d39 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
@@ -1,5 +1,5 @@
-// ERROR: Null can not be a value of a non-null type kotlin.String
-// ERROR: Null can not be a value of a non-null type kotlin.String
+// ERROR: Null can not be a value of a non-null type String
+// ERROR: Null can not be a value of a non-null type String
 import java.util.*
 
 internal class A {
diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
index 5164446a254..f83edeff07a 100644
--- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package test
 
 internal class User {
diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
index 5164446a254..f83edeff07a 100644
--- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package test
 
 internal class User {
diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
index fdcfa855377..5b10faa61f8 100644
--- a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
@@ -1,4 +1,4 @@
-// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): kotlin.String defined in Getter'
+// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): String defined in Getter'
 internal interface Getter {
     fun get(): String
 }
diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt
index 976202cf677..ca34b64e070 100644
--- a/j2k/testData/fileOrElement/overloads/Annotations.kt
+++ b/j2k/testData/fileOrElement/overloads/Annotations.kt
@@ -1,5 +1,5 @@
-// ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
-// ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
+// ERROR: Type mismatch: inferred type is Any? but Any was expected
+// ERROR: Type mismatch: inferred type is Any? but Any was expected
 internal class A {
     @JvmOverloads fun foo(s: String? = null): Any {
         println("s = " + s!!)
diff --git a/j2k/testData/fileOrElement/postProcessing/GetOperator.kt b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt
index 984a5fbbe2d..3af3859994e 100644
--- a/j2k/testData/fileOrElement/postProcessing/GetOperator.kt
+++ b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt
@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.String was expected
+// ERROR: Type mismatch: inferred type is String? but String was expected
 import java.util.HashMap
 import kotlinApi.KotlinClass
 import javaApi.JavaClass
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
index a96c10c5792..9c7c150d871 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
 package demo
 
 import java.util.HashMap
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
index 6bf71b8af31..a7f27cd4296 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package demo
 
 import java.util.ArrayList
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
index 936759fa4d1..9804efbdfb0 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
index 812e6bd8431..20031caea66 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 import java.util.*
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
index a6d236eb3c1..9063c437fc2 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
@@ -1,4 +1,4 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
index 9c79a4408af..8bacb776d36 100644
--- a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
+++ b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed. Expected type mismatch: inferred type is java.util.HashMap<kotlin.Any!, kotlin.Any!> but kotlin.collections.Map<kotlin.String, kotlin.String> was expected
+// ERROR: Type inference failed. Expected type mismatch: inferred type is HashMap<Any!, Any!> but Map<String, String> was expected
 import java.util.*
 
 internal object A {
diff --git a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
index de432978151..c025526d7a1 100644
--- a/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
@@ -1,4 +1,4 @@
-'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14
 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
 'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15
diff --git a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
index 9627524678f..d1920809ebf 100644
--- a/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
+++ b/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt
@@ -1,4 +1,4 @@
-'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14
+'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14
 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
index dfb126785da..dfe2d963e1e 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
@@ -33,10 +33,10 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
index ebeff233c5f..4d2113b7a99 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
@@ -30,10 +30,10 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
index a4e3a6d15e8..c1aa2e715de 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
@@ -20,7 +20,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
index 2856771b984..5b6fbaf1784 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
@@ -37,9 +37,9 @@ Cannot access 'A': it is 'private' in file
 'public' function exposes its 'private' return type A
 Cannot access 'A': it is 'private' in file
 Cannot access 'A': it is 'private' in file
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
 Cannot access 'x': it is 'invisible_fake' in 'B'
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
 
 ================ Step #2 =================
 
@@ -57,8 +57,8 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
+Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
 
 ================ Step #3 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
index ee2b0711e9a..059e63deb32 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
@@ -34,8 +34,8 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Type mismatch: inferred type is kotlin.collections.List<B> but kotlin.collections.List<A> was expected
-Type mismatch: inferred type is kotlin.collections.List<C> but kotlin.collections.List<A> was expected
+Type mismatch: inferred type is List<B> but List<A> was expected
+Type mismatch: inferred type is List<C> but List<A> was expected
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
index aaa57fbc2e4..cf30e6eee91 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
@@ -23,7 +23,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Null can not be a value of a non-null type kotlin.Any
+Null can not be a value of a non-null type Any
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
index 062678e016f..3370de7c993 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
@@ -19,7 +19,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C<kotlin.Any>): kotlin.Unit defined in A
+Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C<Any>): Unit defined in A
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
index 260a3c78c3e..f5140879637 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
@@ -24,7 +24,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
+Type mismatch: inferred type is Any? but Any was expected
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
index 1cc2b929b61..8ff9855fed1 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
@@ -9,7 +9,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-'public constructor A(x: kotlin.String)' conflicts with another declaration in package '<root>'
+'public constructor A(x: String)' conflicts with another declaration in package '<root>'
 
 ================ Step #2 =================
 
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
index 21ab5180f89..c3d008be68b 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
@@ -12,8 +12,8 @@ Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: kotlin.collections.List<kotlin.Any>): kotlin.Unit
-    fun function(list: kotlin.collections.List<kotlin.String>): kotlin.Unit
+    fun function(list: List<Any>): kotlin.Unit
+    fun function(list: List<String>): kotlin.Unit
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: kotlin.collections.List<kotlin.Any>): kotlin.Unit
-    fun function(list: kotlin.collections.List<kotlin.String>): kotlin.Unit
+    fun function(list: List<Any>): kotlin.Unit
+    fun function(list: List<String>): kotlin.Unit
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
index 5d1ddb7b207..cc75bbbadea 100644
--- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
@@ -10,4 +10,4 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test'
+'public fun function(): Unit' conflicts with another declaration in package 'test'
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
index ec12e7f5ab1..12944581320 100644
--- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
@@ -18,4 +18,4 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter
+Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log
index e1179f2c022..1b9a86e1791 100644
--- a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log
@@ -20,4 +20,4 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter
+Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
index 96b7b7bbbf1..ba582b86091 100644
--- a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
@@ -10,7 +10,7 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter
+Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter
 
 ================ Step #2 =================