diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
index 91ce590670f..d3ea7aca91f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt
@@ -92,7 +92,7 @@ fun getExpectedTypePredicate(
 
         val candidates = callee.getReferenceTargets(bindingContext)
                 .filterIsInstance<FunctionDescriptor>()
-                .sortedBy { DescriptorRenderer.DEBUG_TEXT.render(it) }
+                .sortedBy { DescriptorRenderer.FQ_NAMES_IN_TYPES.render(it) }
         if (candidates.isEmpty()) return null
 
         val explicitReceiver = call.getExplicitReceiver()
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index 9c5362e2f63..eaa52cfb8c8 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -350,7 +350,7 @@ class KotlinPsiUnifier(
         }
 
         private fun matchTypes(types1: Collection<KotlinType>, types2: Collection<KotlinType>): Boolean {
-            fun sortTypes(types: Collection<KotlinType>) = types.sortedBy { DescriptorRenderer.DEBUG_TEXT.renderType(it) }
+            fun sortTypes(types: Collection<KotlinType>) = types.sortedBy { DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(it) }
 
             if (types1.size != types2.size) return false
             return (sortTypes(types1).zip(sortTypes(types2))).all { matchTypes(it.first, it.second) == MATCHED }
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
index aca33ad8a69..15a773a1bc8 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test.<anonymous>
-// PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
+// PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
 fun test() {
     J.getMap().filter { <selection>it.key</selection> }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
index a87678ed491..33c1a1a840e 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)> defined in test.<anonymous>
-// PARAM_TYPES: kotlin.collections.Map.Entry<(Boolean..Boolean?), (Boolean..Boolean?)>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
+// PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
 fun test() {
     J.getMap().filter { b(it) }
 }
diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
index 137f6ab5feb..4fd8c1f91c3 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
 // SIBLING:
 fun <T> Array<T>.test() {
diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
index 28c2bf2be88..d52f422ff13 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Array<T>, Cloneable, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Array<T>, kotlin.Cloneable, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
 // SIBLING:
 fun <T> Array<T>.test() {
diff --git a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt
index 63f8e166726..ae5e6672467 100644
--- a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt
+++ b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt
@@ -1,8 +1,8 @@
 // SUGGESTED_NAMES: b, getT
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test
 // PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 
 fun test(a: Int, b: Int): Boolean {
     val t = <selection>a === b</selection>
diff --git a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after
index 8078f68364e..5249f749c1a 100644
--- a/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/identityEquals.kt.after
@@ -1,8 +1,8 @@
 // SUGGESTED_NAMES: b, getT
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in test
 // PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in test
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 
 fun test(a: Int, b: Int): Boolean {
     val t = b(a, b)
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt
index b3372160ede..6b15574c362 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
index 0b0b9c7b8b3..bbdb3760547 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt
index 1dd8ac10160..6328197c7bb 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
index b4b8254c9da..643f86f1137 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt
index f9933cf72c1..7896e5d9f77 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
index 2195568653f..a3dcc43e90e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt
index 42546b5840c..a02e4d09ff0 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
index f2c20bbc4a9..5e2e838e238 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: val b: kotlin.Int defined in foo
 fun bar(a: Int): Int {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt
index 00b71237831..ae25b0af54e 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example
 fun example(i: Int) {
     when (i) {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after
index e9872077a66..39798697006 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_DESCRIPTOR: value-parameter i: kotlin.Int defined in example
 fun example(i: Int) {
     when (i) {
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt
index b6e36df7156..a43ee932ad3 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
index 77119c9956c..3cecc0011e4 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt
index 408e71a09c4..a0be9df95b9 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
index 22afdfc7999..4c2306181c1 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Comparable<Int>
+// PARAM_TYPES: kotlin.Int, kotlin.Comparable<kotlin.Int>
 // PARAM_TYPES: kotlin.Int
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: var b: kotlin.Int defined in foo
diff --git a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt
index 210cfad7eb2..0b94a87611d 100644
--- a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt
+++ b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
+// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
 // PARAM_DESCRIPTOR: val s: kotlin.String? defined in foo
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after
index dc64d33b52e..9f0343bffd4 100644
--- a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after
+++ b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
+// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
 // PARAM_DESCRIPTOR: val s: kotlin.String? defined in foo
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt
index f07563dbe31..e8939913037 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getN
-// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence
-// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
+// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, kotlin.CharSequence
+// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
 fun test() {
     val property = System.getProperty("some")
     val n = <selection>property?.length</selection>
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after
index b5e4df7d88c..d1631097c14 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getN
-// PARAM_TYPES: String?, String, kotlin.CharSequence?, CharSequence
-// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
+// PARAM_TYPES: kotlin.String?, kotlin.String, kotlin.CharSequence?, kotlin.CharSequence
+// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
 fun test() {
     val property = System.getProperty("some")
     val n = i(property)
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt
index bbe8eafcedb..05ebeeac9d4 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getN
-// PARAM_TYPES: String, CharSequence
-// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
+// PARAM_TYPES: kotlin.String, kotlin.CharSequence
+// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
 fun test() {
     val property = System.getProperty("some")
     val n = <selection>property.length</selection>
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after
index 3a3f4bee1f9..a6ea56ea746 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after
@@ -1,10 +1,10 @@
 // WITH_RUNTIME
 // SUGGESTED_NAMES: i, getN
-// PARAM_TYPES: String, CharSequence
-// PARAM_DESCRIPTOR: val property: (String..String?) defined in test
+// PARAM_TYPES: kotlin.String, kotlin.CharSequence
+// PARAM_DESCRIPTOR: val property: kotlin.String! defined in test
 fun test() {
     val property = System.getProperty("some")
     val n = i(property)
 }
 
-private fun i(property: String) = property.length
+private fun i(property: String) = property.length
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
index c248e93e1ab..2e91d1ad298 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(String..String?)>..kotlin.collections.List<(String..String?)>) defined in test
-// PARAM_TYPES: kotlin.collections.List<(String..String?)>, kotlin.collections.MutableList<(String..String?)>, kotlin.collections.MutableCollection<(String..String?)>, kotlin.collections.Collection<(String..String?)>
+// PARAM_DESCRIPTOR: val data: kotlin.collections.(Mutable)List<kotlin.String!> defined in test
+// PARAM_TYPES: kotlin.collections.List<kotlin.String!>, kotlin.collections.MutableList<kotlin.String!>, kotlin.collections.MutableCollection<kotlin.String!>, kotlin.collections.Collection<kotlin.String!>
 fun test(): Boolean {
     val j: J? = null
     val data = j?.getData() ?: return false
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
index 322dda173a8..eb47a1c470f 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(String..String?)>..kotlin.collections.List<(String..String?)>) defined in test
-// PARAM_TYPES: kotlin.collections.List<(String..String?)>, kotlin.collections.MutableList<(String..String?)>, kotlin.collections.MutableCollection<(String..String?)>, kotlin.collections.Collection<(String..String?)>
+// PARAM_DESCRIPTOR: val data: kotlin.collections.(Mutable)List<kotlin.String!> defined in test
+// PARAM_TYPES: kotlin.collections.List<kotlin.String!>, kotlin.collections.MutableList<kotlin.String!>, kotlin.collections.MutableCollection<kotlin.String!>, kotlin.collections.Collection<kotlin.String!>
 fun test(): Boolean {
     val j: J? = null
     val data = j?.getData() ?: return false
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt
index f0c8777e59b..8732f2d8f13 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_TYPES: X<kotlin.Any>
 // PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
 // PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any> defined in foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
index 37c468d341a..d2698209ac8 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_TYPES: X<kotlin.Any>
 // PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
 // PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any> defined in foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt
index ce5a9dc2a33..42f634a6fb2 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
+// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
 // PARAM_TYPES: X<kotlin.Any?>
 // PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
 // PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any?> defined in foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
index aa674b5c368..e29b0f27dc3 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String?, kotlin.Comparable<String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
+// PARAM_TYPES: kotlin.String?, kotlin.Comparable<kotlin.String>?, kotlin.CharSequence?, java.io.Serializable?, kotlin.Any?
 // PARAM_TYPES: X<kotlin.Any?>
 // PARAM_DESCRIPTOR: value-parameter s: kotlin.String? defined in foo
 // PARAM_DESCRIPTOR: value-parameter x: X<kotlin.Any?> defined in foo
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt
index 178ab5d0879..1203a5861dc 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
+// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: (kotlin.Int) -> Int
+// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
index 177028b44d4..eae8c1b1173 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): Int defined in foo.bar
+// PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: (kotlin.Int) -> Int
+// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt
index b2ce762b95c..c6025c81add 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar(m: Int) = this * m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
index 0116afbdc5a..8bffcd717b5 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar(m: Int) = this * m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt
index 180db97ffca..11b27028696 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt
@@ -1,9 +1,9 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar1(m: Int) = this + m + n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
index 04093fefb5f..456437fd651 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after
@@ -1,9 +1,9 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): Int defined in foo
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar1(m: Int) = this + m + n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt
index c7fc386170a..a450f9ea46b 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar(m: Int) = this * m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
index 05a49e6f9ac..5aceb00d383 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> Int
+// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun Int.bar(m: Int) = this * m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt
index ce61588db14..4a9c510955e 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: (kotlin.Int) -> Int
+// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun bar(m: Int) = m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
index df8c2666cb0..cbf616099f1 100644
--- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after
@@ -1,7 +1,7 @@
 // OPTIONS: true, false, false, false, true, false
-// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): Int defined in foo
+// PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo
 // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo
-// PARAM_TYPES: (kotlin.Int) -> Int
+// PARAM_TYPES: (kotlin.Int) -> kotlin.Int
 // PARAM_TYPES: kotlin.Int
 fun foo(n: Int): Int {
     fun bar(m: Int) = m * n
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt
index f8a518b1939..5f40433977a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun Named.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun Named.foo(): kotlin.String defined in Test
 // PARAM_TYPES: Named
 public class Test {
     private fun Named.foo() = <selection>name</selection>
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt.after
index 8efa5e7cdde..fbcadad6f64 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun Named.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun Named.foo(): kotlin.String defined in Test
 // PARAM_TYPES: Named
 public class Test {
     private fun Named.foo() = s()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt
index e9a694da3a9..c013b716339 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
 // PARAM_TYPES: NamedEx
 // SIBLING:
 public class Test {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt.after
index 410e675fa89..090c3918d5d 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
 // PARAM_TYPES: NamedEx
 // SIBLING:
 public class Test {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt
index 1b0cd1955a7..926cfacf79f 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
 // PARAM_TYPES: NamedEx
 // SIBLING:
 public class Test {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt.after
index 781ced9165f..4bd0555edbb 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): [@org.jetbrains.annotations.NotNull] String defined in Test
+// PARAM_DESCRIPTOR: private final fun NamedEx.foo(): kotlin.String defined in Test
 // PARAM_TYPES: NamedEx
 // SIBLING:
 public class Test {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
index ee309db23a8..ff659031042 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
 fun String.foo(f: () -> Unit) {
     f()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
index b91e5d14cf0..e66010ea5a6 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.String, Comparable<String>, CharSequence, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
 fun String.foo(f: () -> Unit) {
     f()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
index 7c82bacf2e8..40dcb151bdc 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
 // PARAM_DESCRIPTOR: public final class A defined in root package
-// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
+// PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
 // SIBLING:
 class A {
     val a = 1
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
index 3d9e50b39ea..8440c382cff 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
 // PARAM_DESCRIPTOR: public final class A defined in root package
-// PARAM_DESCRIPTOR: public final fun B.foo(): Int defined in A
+// PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
 // SIBLING:
 class A {
     val a = 1
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt
index cc242cbcb5b..c91459e36ae 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
 // SIBLING:
 fun main(args: Array<String>) {
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
index a7945f3e63b..7c5d8433f4a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt.after
@@ -1,4 +1,4 @@
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 // PARAM_DESCRIPTOR: val a: kotlin.Int defined in main
 // SIBLING:
 fun main(args: Array<String>) {
diff --git a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt
index 6b9b00c9f66..6c13465a538 100644
--- a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
+// PARAM_DESCRIPTOR: val a: A defined in foo.bar
 // PARAM_TYPES: T
 interface T
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after
index c161243ecaa..3b3191a6706 100644
--- a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
+// PARAM_DESCRIPTOR: val a: A defined in foo.bar
 // PARAM_TYPES: T
 interface T
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt
index 46c301d28c2..92ad3957eae 100644
--- a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt
@@ -1,5 +1,5 @@
-// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
-// PARAM_TYPES: foo.A, T
+// PARAM_DESCRIPTOR: val a: A defined in foo.bar
+// PARAM_TYPES: A, T
 interface T
 
 fun foo(): T {
diff --git a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after
index c1e1b733c34..c17cd6a0d4a 100644
--- a/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt.after
@@ -1,5 +1,5 @@
-// PARAM_DESCRIPTOR: val a: foo.A defined in foo.bar
-// PARAM_TYPES: foo.A, T
+// PARAM_DESCRIPTOR: val a: A defined in foo.bar
+// PARAM_TYPES: A, T
 interface T
 
 fun foo(): T {
diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt
index 536d1c91793..d7b51357d87 100644
--- a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt
+++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt
@@ -1,5 +1,5 @@
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 fun foo(a: Int): String {
     val x = "abc$a"
     val y = "abc${a}"
diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after
index c803eaa985c..5562cb340ad 100644
--- a/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after
+++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullContent.kt.after
@@ -1,5 +1,5 @@
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 fun foo(a: Int): String {
     val x = s(a)
     val y = s(a)
diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt
index 4bc2786f77b..da1df5a7d6b 100644
--- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt
+++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt
@@ -1,5 +1,5 @@
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 fun foo(a: Int): String {
     val x = "-$a"
     val y = "x${a}y"
diff --git a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after
index 19003d2eb98..099dc12dbde 100644
--- a/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after
+++ b/idea/testData/refactoring/extractFunction/stringTemplates/fullEntryWithSimpleName.kt.after
@@ -1,5 +1,5 @@
 // PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in foo
-// PARAM_TYPES: kotlin.Int, Number, Comparable<Int>, java.io.Serializable, Any
+// PARAM_TYPES: kotlin.Int, kotlin.Number, kotlin.Comparable<kotlin.Int>, java.io.Serializable, kotlin.Any
 fun foo(a: Int): String {
     val x = "-${i(a)}"
     val y = "x${i(a)}y"
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
index ec8b8ec83b0..0b5e83ded58 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
@@ -255,7 +255,7 @@ abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTestCase(
                 } else ExtractionOptions.DEFAULT
             }
 
-            val renderer = DescriptorRenderer.DEBUG_TEXT
+            val renderer = DescriptorRenderer.FQ_NAMES_IN_TYPES
 
             val editor = fixture.editor
             val handler = ExtractKotlinFunctionHandler(