diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.kt b/compiler/testData/cli/jvm/wrongAbiVersion.kt
index 60a787af9f6..13996d57bc2 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.kt
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.kt
@@ -3,5 +3,5 @@ import wrong.*
 fun foo(x: ClassWithWrongAbiVersion) {
     bar()
 
-    1.set(2, 3)
+    1.printStackTrace(2, 3)
 }
diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.out b/compiler/testData/cli/jvm/wrongAbiVersion.out
index a3d55e4cf77..e5dd8d05d8d 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.out
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.out
@@ -3,9 +3,10 @@ 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 operator fun <K, V> kotlin.MutableMap<kotlin.Int, kotlin.Int>.set(key: kotlin.Int, value: kotlin.Int): kotlin.Int? defined in kotlin
+public fun kotlin.Throwable.printStackTrace(stream: java.io.PrintStream): kotlin.Unit defined in kotlin
+public fun kotlin.Throwable.printStackTrace(writer: java.io.PrintWriter): kotlin.Unit defined in kotlin
 (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.set(2, 3)
+    1.printStackTrace(2, 3)
       ^
 compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class: error: class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is unknown, expected ABI version is $ABI_VERSION$
 compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class: error: class 'wrong/WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is unknown, expected ABI version is $ABI_VERSION$
diff --git a/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt b/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt
index 5e976e4367c..11861f0a938 100644
--- a/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt
+++ b/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt
@@ -1,14 +1,25 @@
 // RUNTIME_WITH_SOURCES
 // CHECK_BOX
 // SEARCH_TEXT: joinToString
+// REF: (for Array<out T> in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?)
 // REF: (for Array<out T> in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?)
+// REF: (for BooleanArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Boolean) -> CharSequence)?)
 // REF: (for BooleanArray in kotlin).joinToString(String,String,String,Int,String,((Boolean) -> String)?)
+// REF: (for ByteArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Byte) -> CharSequence)?)
 // REF: (for ByteArray in kotlin).joinToString(String,String,String,Int,String,((Byte) -> String)?)
+// REF: (for CharArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Char) -> CharSequence)?)
 // REF: (for CharArray in kotlin).joinToString(String,String,String,Int,String,((Char) -> String)?)
+// REF: (for DoubleArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Double) -> CharSequence)?)
 // REF: (for DoubleArray in kotlin).joinToString(String,String,String,Int,String,((Double) -> String)?)
+// REF: (for FloatArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Float) -> CharSequence)?)
 // REF: (for FloatArray in kotlin).joinToString(String,String,String,Int,String,((Float) -> String)?)
+// REF: (for IntArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Int) -> CharSequence)?)
 // REF: (for IntArray in kotlin).joinToString(String,String,String,Int,String,((Int) -> String)?)
+// REF: (for Iterable<T> in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?)
 // REF: (for Iterable<T> in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?)
+// REF: (for LongArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Long) -> CharSequence)?)
 // REF: (for LongArray in kotlin).joinToString(String,String,String,Int,String,((Long) -> String)?)
+// REF: (for Sequence<T> in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?)
 // REF: (for Sequence<T> in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?)
+// REF: (for ShortArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Short) -> CharSequence)?)
 // REF: (for ShortArray in kotlin).joinToString(String,String,String,Int,String,((Short) -> String)?)
\ No newline at end of file
diff --git a/idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt b/idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt
index 174434c280d..aae0ce78535 100644
--- a/idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt
+++ b/idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt
@@ -2,4 +2,4 @@ fun f() {
     listOf(1).joinToString(<caret>)
 }
 
-//Text: (<highlight>separator: String = ", "</highlight>, prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "...", transform: ((Int) -> String)? = null), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
+//Text: (<highlight>separator: CharSequence = ", "</highlight>, prefix: CharSequence = "", postfix: CharSequence = "", limit: Int = -1, truncated: CharSequence = "...", transform: ((Int) -> CharSequence)? = null), Disabled: false, Strikeout: false, Green: true
\ No newline at end of file
diff --git a/idea/testData/resolve/partialBodyResolve/IfReturn.dump b/idea/testData/resolve/partialBodyResolve/IfReturn.dump
index 64f0705e4c8..5c512d0b75b 100644
--- a/idea/testData/resolve/partialBodyResolve/IfReturn.dump
+++ b/idea/testData/resolve/partialBodyResolve/IfReturn.dump
@@ -1,4 +1,4 @@
-Resolve target: fun kotlin.String.isNotEmpty(): kotlin.Boolean
+Resolve target: fun kotlin.CharSequence.isNotEmpty(): kotlin.Boolean
 ----------------------------------------------
 fun foo(p: String) {
     /* STATEMENT DELETED: if (x()) return */