diff --git a/idea/testData/copyPaste/imports/ClassResolvedToPackage.expected.kt b/idea/testData/copyPaste/imports/ClassResolvedToPackage.expected.kt
index e69b77335e3..9c4e5c5c729 100644
--- a/idea/testData/copyPaste/imports/ClassResolvedToPackage.expected.kt
+++ b/idea/testData/copyPaste/imports/ClassResolvedToPackage.expected.kt
@@ -1,8 +1,9 @@
+// ERROR: Unresolved reference: a
 package to
 
 import a.a
 
-fun f(i: a) {
+fun f(i: a.a) { // todo must be i: a
     a
     a()
 }
\ No newline at end of file
diff --git a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
index 63b8e7e6f02..5ce2e3cd6ee 100644
--- a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
+++ b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt
@@ -5,7 +5,7 @@ class a {
     }
 }
 
-<selection>fun f(i: a) {
+<selection>fun f(i: a) { // todo must be i: a
     a
     a()
 }</selection>
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test
index d0143c02c20..3ffe6ebe08d 100644
--- a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test
+++ b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test
@@ -1,5 +1,5 @@
 {
   "mainFile": "source/foo.kt",
   "type": "MOVE_FILES",
-  "targetPackage": "target"
+  "targetPackage": "bas"
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/target/foo.kt b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/bas/foo.kt
similarity index 79%
rename from idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/target/foo.kt
rename to idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/bas/foo.kt
index 5f4f7acc617..33e9c9884aa 100644
--- a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/target/foo.kt
+++ b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/bas/foo.kt
@@ -1,4 +1,4 @@
-package target
+package bas
 
 import source.foo
 
diff --git a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/source/bar.kt b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/source/bar.kt
index 820681ce27a..a693031c10d 100644
--- a/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/source/bar.kt
+++ b/idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/after/source/bar.kt
@@ -1,6 +1,6 @@
 package source
 
-import target.C
+import bas.C
 
 fun C.foo() {
 
diff --git a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt
index 7152c0070e2..57f3312d61b 100644
--- a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt
+++ b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt
@@ -1,2 +1,4 @@
+
+// todo must be: s: same
 fun f(s: <selection>same.same</selection>) {
 }
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt.after b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt.after
index ec85b599c0a..db7e8c5b4eb 100644
--- a/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt.after
+++ b/idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt.after
@@ -1,4 +1,5 @@
 import same.same
 
-fun f(s: same) {
+// todo must be: s: same
+fun f(s: same.same) {
 }
\ No newline at end of file