diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified.dependency.kt b/idea/testData/shortenRefs/constructor/LeaveQualified.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/constructor/LeaveQualified.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified.kt b/idea/testData/shortenRefs/constructor/LeaveQualified.kt
index 4b4c644b931..7f8e70418a7 100644
--- a/idea/testData/shortenRefs/constructor/LeaveQualified.kt
+++ b/idea/testData/shortenRefs/constructor/LeaveQualified.kt
@@ -1,3 +1,3 @@
 import java.util.Date
 
-val x = <selection>java.sql.Date(1)</selection>
+val x = <selection>dependency.Date(1)</selection>
diff --git a/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after b/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after
index d8a45a690b4..489e4c3238e 100644
--- a/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after
+++ b/idea/testData/shortenRefs/constructor/LeaveQualified.kt.after
@@ -1,3 +1,3 @@
 import java.util.Date
 
-val x = java.sql.Date(1)
+val x = dependency.Date(1)
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.dependency.kt b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt
index 4b4c644b931..7f8e70418a7 100644
--- a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt
@@ -1,3 +1,3 @@
 import java.util.Date
 
-val x = <selection>java.sql.Date(1)</selection>
+val x = <selection>dependency.Date(1)</selection>
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after
index d8a45a690b4..489e4c3238e 100644
--- a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after
@@ -1,3 +1,3 @@
 import java.util.Date
 
-val x = java.sql.Date(1)
+val x = dependency.Date(1)
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.dependency.kt b/idea/testData/shortenRefs/imports/leaveQualifiedType.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt
index 84791650b1c..a3159aaa0bf 100644
--- a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt
@@ -1,3 +1,3 @@
 import java.util.Date
 
-class A : <selection>java.sql.Date</selection>
\ No newline at end of file
+class A : <selection>dependency.Date</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after
index 32a596fd4f8..c493277f306 100644
--- a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after
+++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after
@@ -1,3 +1,3 @@
 import java.util.Date
 
-class A : java.sql.Date
\ No newline at end of file
+class A : dependency.Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/FunctionType.kt b/idea/testData/shortenRefs/type/FunctionType.kt
index 1a3d207148a..e84a6716c31 100644
--- a/idea/testData/shortenRefs/type/FunctionType.kt
+++ b/idea/testData/shortenRefs/type/FunctionType.kt
@@ -1,3 +1,3 @@
 class A {
-    var x: <selection>((java.io.File, java.util.ArrayList<String>) -> java.awt.Container)?</selection> = null
+    var x: <selection>((java.io.File) -> java.util.ArrayList<String>)?</selection> = null
 }
diff --git a/idea/testData/shortenRefs/type/FunctionType.kt.after b/idea/testData/shortenRefs/type/FunctionType.kt.after
index 2fa9f9b7e45..9809fd5ec41 100644
--- a/idea/testData/shortenRefs/type/FunctionType.kt.after
+++ b/idea/testData/shortenRefs/type/FunctionType.kt.after
@@ -1,7 +1,6 @@
-import java.awt.Container
 import java.io.File
 import java.util.ArrayList
 
 class A {
-    var x: ((File, ArrayList<String>) -> Container)? = null
+    var x: ((File) -> ArrayList<String>)? = null
 }
diff --git a/idea/testData/shortenRefs/type/GenericType3.dependency.kt b/idea/testData/shortenRefs/type/GenericType3.dependency.kt
new file mode 100644
index 00000000000..3cae37812c8
--- /dev/null
+++ b/idea/testData/shortenRefs/type/GenericType3.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Array
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/GenericType3.kt b/idea/testData/shortenRefs/type/GenericType3.kt
index 74387a10c57..e4b798b0045 100644
--- a/idea/testData/shortenRefs/type/GenericType3.kt
+++ b/idea/testData/shortenRefs/type/GenericType3.kt
@@ -1 +1 @@
-val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
\ No newline at end of file
+val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, dependency.Array></selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/GenericType3.kt.after b/idea/testData/shortenRefs/type/GenericType3.kt.after
index d0379492698..56761d328ca 100644
--- a/idea/testData/shortenRefs/type/GenericType3.kt.after
+++ b/idea/testData/shortenRefs/type/GenericType3.kt.after
@@ -1 +1 @@
-val x: Map.Entry<Array<String>, java.sql.Array>
\ No newline at end of file
+val x: Map.Entry<Array<String>, dependency.Array>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/LeaveQualified.dependency.kt b/idea/testData/shortenRefs/type/LeaveQualified.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/type/LeaveQualified.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/LeaveQualified.kt b/idea/testData/shortenRefs/type/LeaveQualified.kt
index 3b653d9a5eb..f2990db9bc0 100644
--- a/idea/testData/shortenRefs/type/LeaveQualified.kt
+++ b/idea/testData/shortenRefs/type/LeaveQualified.kt
@@ -1,3 +1,3 @@
 import java.util.Date
 
-class A : <selection>java.sql.Date</selection>
+class A : <selection>dependency.Date</selection>
diff --git a/idea/testData/shortenRefs/type/LeaveQualified.kt.after b/idea/testData/shortenRefs/type/LeaveQualified.kt.after
index 168f5ce822c..ea2f8e15041 100644
--- a/idea/testData/shortenRefs/type/LeaveQualified.kt.after
+++ b/idea/testData/shortenRefs/type/LeaveQualified.kt.after
@@ -1,3 +1,3 @@
 import java.util.Date
 
-class A : java.sql.Date
+class A : dependency.Date
diff --git a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.dependency.kt b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt
index 7b70e7aeb1d..c9399c9c3fa 100644
--- a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt
+++ b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt
@@ -1,3 +1,3 @@
 import java.util.*
 
-val v: ArrayList<<selection>java.sql.Date</selection>>
\ No newline at end of file
+val v: ArrayList<<selection>dependency.Date</selection>>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after
index 9a827a1069a..2ad55368e11 100644
--- a/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after
+++ b/idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt.after
@@ -1,4 +1,4 @@
-import java.sql.Date
+import dependency.Date
 import java.util.*
 
 val v: ArrayList<Date>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/TwoClassesSameNames.dependency.kt b/idea/testData/shortenRefs/type/TwoClassesSameNames.dependency.kt
new file mode 100644
index 00000000000..226f43311c7
--- /dev/null
+++ b/idea/testData/shortenRefs/type/TwoClassesSameNames.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class Date
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt b/idea/testData/shortenRefs/type/TwoClassesSameNames.kt
index c3d0ed3aa7d..ed8e0b106b5 100644
--- a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt
+++ b/idea/testData/shortenRefs/type/TwoClassesSameNames.kt
@@ -1,3 +1,3 @@
 class A {
-    val x: <selection>java.util.HashMap<java.util.Date, java.sql.Date></selection>
+    val x: <selection>java.util.HashMap<java.util.Date, dependency.Date></selection>
 }
diff --git a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after b/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after
index 9af4d36a26e..ee3aaaf08d7 100644
--- a/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after
+++ b/idea/testData/shortenRefs/type/TwoClassesSameNames.kt.after
@@ -2,5 +2,5 @@ import java.util.Date
 import java.util.HashMap
 
 class A {
-    val x: HashMap<Date, java.sql.Date>
+    val x: HashMap<Date, dependency.Date>
 }