diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
index 6d8498e42aa..f05326e2ad4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
@@ -1,3 +1,5 @@
+package test;
+
 class ClassObject {
     void accessToClassObject() {
         WithClassObject.object$.foo();
@@ -18,4 +20,4 @@ class ClassObject {
         new WithClassObject.MyInner().foo();
         new WithClassObject.MyInner().getValue();
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt
index c86ec4a716d..3bf004730ba 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt
@@ -1,3 +1,5 @@
+package test
+
 class WithClassObject {
   class object {
     fun foo() {}
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.java b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.java
index 97b3b7561bb..8e6bf00eb39 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.java
@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     void foo() {
         new A();
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt
index 979ee73c04d..84f7685ab88 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt
@@ -1 +1,3 @@
+package test
+
 class A(val a: Int = 1)
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.java b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.java
index 97b3b7561bb..8e6bf00eb39 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.java
@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     void foo() {
         new A();
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt
index eaf5fec82c3..e0cb4b06bf3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt
@@ -1 +1,3 @@
+package test
+
 class A(val a: Int = 1, val b: String = "default")
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.java b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.java
index 2d1e5d107fc..eb941e55067 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsAbstractListT {
     {
         Mine<String> mine = null;
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt
index 472c847fd89..1500b419316 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt
@@ -1 +1,3 @@
+package test
+
 abstract class Mine<T>() : java.util.AbstractList<T>()
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.java b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.java
index 699606e6a43..4f295b4ad9e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.java
@@ -1,3 +1,5 @@
+package test;
+
 
 class PlainExtendsListString {
     {
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt
index 8de577c0bcc..47162f4c9e4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt
@@ -1 +1,3 @@
+package test
+
 abstract class Mine : java.util.List<String>
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.java b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.java
index 5664662764e..5e61e63a811 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.java
@@ -1,3 +1,5 @@
+package test;
+
 
 class ImplementsMapPP {
     {
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt
index a973a76c33e..710dff314a0 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt
@@ -1 +1,3 @@
+package test
+
 abstract class Mine<P1, P2> : java.util.Map<P2, P1>
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/Simple.java b/compiler/testData/compileJavaAgainstKotlin/class/Simple.java
index c58506318fc..345be52a762 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/Simple.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/Simple.java
@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     {
         new Impossible<String>();
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/Simple.kt b/compiler/testData/compileJavaAgainstKotlin/class/Simple.kt
index 854e4e56c6f..9ff8ea45516 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/Simple.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/Simple.kt
@@ -1 +1,3 @@
+package test
+
 class Impossible<P>()
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt
index a57b7dff894..57a24fb0e22 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt
@@ -3,4 +3,3 @@ package test
 enum class MyEnum {
   OK
 }
-
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.java b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.java
index 688c8324601..606302b8534 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.java
@@ -4,4 +4,4 @@ public class kt4050 {
     public static void main(String[] args) {
         MyEnum.ENTRY.getOrd();
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt
index 0d06d5b8b1a..530aaaed424 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt
@@ -6,4 +6,4 @@ enum class MyEnum(deprecated("") val ord: Int) {
     fun f(Deprecated p: Int) {
 
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Any.java b/compiler/testData/compileJavaAgainstKotlin/method/Any.java
index f1b81d405ed..2ac8ac590ce 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Any.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Any.java
@@ -1,6 +1,7 @@
+package test;
 
 class Any {
     {
-        Object r = _DefaultPackage.anyany(new Object(), null);
+        Object r = TestPackage.anyany(new Object(), null);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Any.kt b/compiler/testData/compileJavaAgainstKotlin/method/Any.kt
index 2483cfdeb0e..b03f51e1c02 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Any.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Any.kt
@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to preserve generic signature
 fun anyany(a: Any, ignore: java.util.List<String>) = a
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java
index c05d60d0acb..e0875144259 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java
@@ -1,7 +1,9 @@
+package test;
+
 
 class ArrayOfIntArray {
     {
         int[][] a = new int[0][];
-        int[][] r = _DefaultPackage.ohMy(a);
+        int[][] r = TestPackage.ohMy(a);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt
index a64acfd5de4..6eb86a24fed 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt
@@ -1 +1,3 @@
+package test
+
 fun ohMy(p: Array<IntArray>) = p
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java
index 0cc724cc97b..c1c801e6164 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java
@@ -1,7 +1,9 @@
+package test;
+
 
 class ArrayOfIntArray {
     {
         Integer[][] a = new Integer[0][];
-        Integer[][] r = _DefaultPackage.ohMy(a, null);
+        Integer[][] r = TestPackage.ohMy(a, null);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt
index 78f9664434c..ecebc0627da 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt
@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is generated
 fun ohMy(p: Array<Array<Int>>, ignore: java.util.List<String>) = p
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.java b/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.java
index 44819374c47..e579193ce5d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.java
@@ -1,6 +1,8 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
-        _DefaultPackage.foo$default(1, 0);
+        TestPackage.foo$default(1, 0);
     }
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt b/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt
index f5b0c242c83..e1eaa706bd6 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt
@@ -1 +1,3 @@
+package test
+
 fun foo(a: Int = 1) {}
\ No newline at end of file
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Delegation.java b/compiler/testData/compileJavaAgainstKotlin/method/Delegation.java
index fe227e84c7a..b757e4d4bae 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Delegation.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Delegation.java
@@ -1,7 +1,9 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
         Test test = new Test();
         test.foo();
         test.getBar();
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt b/compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt
index 579e031b8d2..81c402f355b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt
@@ -1,3 +1,5 @@
+package test
+
 trait Trait {
     fun foo()
     val bar: Int
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java
index 7eeb185a88b..5dd08cc06a0 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java
@@ -1,5 +1,7 @@
+package test;
+
 class GenericArray {
     public static void ggff() {
-        String[] s = _DefaultPackage.ffgg(new String[0]);
+        String[] s = TestPackage.ffgg(new String[0]);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt
index 9c997ac2807..3679e59b383 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt
@@ -1 +1,3 @@
+package test
+
 fun <P> ffgg(a: Array<P>) = a
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Hello.java b/compiler/testData/compileJavaAgainstKotlin/method/Hello.java
index 24288249af3..fed36689177 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Hello.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Hello.java
@@ -1,6 +1,8 @@
+package test;
+
 
 class Hello {
     public static void xx() {
-        String s = _DefaultPackage.f();
+        String s = TestPackage.f();
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Hello.kt b/compiler/testData/compileJavaAgainstKotlin/method/Hello.kt
index 46dbfe4fe39..9ad43045f1a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Hello.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Hello.kt
@@ -1 +1,3 @@
+package test
+
 fun f() = "hello"
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Int.java b/compiler/testData/compileJavaAgainstKotlin/method/Int.java
index be94af1be44..d75ff1da24e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Int.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Int.java
@@ -1,6 +1,8 @@
+package test;
+
 
 class Int {
     {
-        int r = _DefaultPackage.lll(1);
+        int r = TestPackage.lll(1);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Int.kt b/compiler/testData/compileJavaAgainstKotlin/method/Int.kt
index c6bf5becc49..856c751fc5a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Int.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Int.kt
@@ -1 +1,3 @@
+package test
+
 fun lll(a: Int) = a
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java
index 7ce5f171847..8166cdacfb4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java
@@ -1,6 +1,8 @@
+package test;
+
 
 class IntArray {
     {
-        int[] r = _DefaultPackage.doNothing(new int[0], null);
+        int[] r = TestPackage.doNothing(new int[0], null);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt
index 70f76451481..9ef1fa09efb 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt
@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is not erased
 fun doNothing(array: IntArray, ignore: java.util.List<String>) = array
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java
index 76512eee587..cbaeaaf51db 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java
@@ -1,6 +1,8 @@
+package test;
+
 
 class IntWithDefault {
     {
-        int r = _DefaultPackage.www(1);
+        int r = TestPackage.www(1);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt
index 260a24d9e8d..7791f269aa4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt
@@ -1 +1,3 @@
+package test
+
 fun www(p: Int = 1) = p
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java
index e36244fcab3..271eff04aba 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java
@@ -1,6 +1,8 @@
+package test;
+
 
 class IntArray {
     {
-        Integer[] r = _DefaultPackage.doNothing(new Integer[0], null);
+        Integer[] r = TestPackage.doNothing(new Integer[0], null);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt
index 6d241620970..c7ace740bb0 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt
@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is preserved
 fun doNothing(array: Array<Int>, ignore: java.util.List<String>) = array
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java
index 3b7a16b00f2..7c459b73c7c 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java
@@ -1,3 +1,5 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
@@ -5,7 +7,7 @@ class ListOfInt {
 
     public static void hhh() {
         List<Integer> list = new ArrayList<Integer>();
-        List<Integer> r = _DefaultPackage.ggg(list);
+        List<Integer> r = TestPackage.ggg(list);
     }
 
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
index 882b5df1375..8cd914831b4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
@@ -1 +1,3 @@
+package test
+
 fun ggg(list: List<Int>) = list
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java
index 5c42ac0e651..b1d46afa1ba 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java
@@ -1,9 +1,11 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
 class ListString {
     public static void gg() {
         List<String> list = new ArrayList<String>();
-        _DefaultPackage.ff(list);
+        TestPackage.ff(list);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
index 1fdd7cc33ce..ca0d75d4820 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
@@ -1 +1,3 @@
+package test
+
 fun ff(p: List<String>) = 1
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java
index da354824513..9f2191241da 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java
@@ -1,3 +1,5 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
@@ -5,7 +7,7 @@ class ListOfT {
 
     public static void check() {
         List<String> list = new ArrayList<String>();
-        List<String> r = _DefaultPackage.listOfT(list);
+        List<String> r = TestPackage.listOfT(list);
     }
 
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
index 13571dff832..9ae094a8287 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
@@ -1 +1,3 @@
+package test
+
 fun <P> listOfT(list: List<P>) = list
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java
index 90127d98c4e..2b152f74f5e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java
@@ -1,3 +1,5 @@
+package test;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.math.BigDecimal;
@@ -6,6 +8,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<BigDecimal, String> map = new HashMap<BigDecimal, String>();
         
-        Map<BigDecimal, String> r = _DefaultPackage.fff(map);
+        Map<BigDecimal, String> r = TestPackage.fff(map);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
index f3b3b85476b..58e79b33001 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
@@ -1,2 +1,4 @@
+package test
+
 
 fun <K> fff(map: Map<K, String>) = map
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java
index 668b766946b..fa82d8c0187 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java
@@ -1,3 +1,5 @@
+package test;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.math.BigDecimal;
@@ -6,6 +8,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<String, Integer> map = new HashMap<String, Integer>();
         
-        Map<String, Integer> r = _DefaultPackage.fff(map);
+        Map<String, Integer> r = TestPackage.fff(map);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
index 324a55bd3ba..bb2a63d88d8 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
@@ -1,2 +1,4 @@
+package test
+
 
 fun fff(map: Map<String, Int?>) = map
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java
index 41bc2673345..14d2cf5b935 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java
@@ -1,7 +1,9 @@
+package test;
+
 class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        java.util.List<? extends String> s = id2(_DefaultPackage.id(null));
+        java.util.List<? extends String> s = id2(TestPackage.id(null));
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt
index a6d938f90ea..a43509b6739 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt
@@ -1 +1,3 @@
+package test
+
 fun <P1 : List<String>> id(p: P1) = p
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java
index 7cf1bb1f155..16e6c24ea6d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java
@@ -1,7 +1,9 @@
+package test;
+
 class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        String s = id2(_DefaultPackage.id(null));
+        String s = id2(TestPackage.id(null));
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt
index e360425de59..cda0ffd5654 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt
@@ -1 +1,3 @@
+package test
+
 fun <T : String> id(p: T) = p
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java
index 32db41f15b1..32537501afe 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java
@@ -1,9 +1,11 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
 class Vararg {
     {
         List<String> list = new ArrayList<String>();
-        List<String> r = _DefaultPackage.gg(list, 3, 4, 5, 6);
+        List<String> r = TestPackage.gg(list, 3, 4, 5, 6);
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
index 9318d6faf34..85ac965ea93 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
@@ -1 +1,3 @@
+package test
+
 fun gg(list: List<String>, vararg ints: Int) = list
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Void.java b/compiler/testData/compileJavaAgainstKotlin/method/Void.java
index 830e47e685d..9eb5f2d9e55 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Void.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Void.java
@@ -1,5 +1,7 @@
+package test;
+
 class Void {
     {
-        _DefaultPackage.f();
+        TestPackage.f();
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Void.kt b/compiler/testData/compileJavaAgainstKotlin/method/Void.kt
index 119058ec2d9..5095c27df8b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Void.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Void.kt
@@ -1 +1,3 @@
+package test
+
 fun f() { }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.java
index 98a91cf5dc3..7d5c6e900da 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         byte x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt
index 56ed4bb0c24..230e0d16013 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.java
index c564b63d36a..5acd3552e0d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.java
@@ -1,3 +1,5 @@
+package test;
+
 class Test {
     void test() {
         A<Integer> a = new B();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt
index 31d95a680a0..918943a1ab1 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.java
index c564b63d36a..5acd3552e0d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.java
@@ -1,3 +1,5 @@
+package test;
+
 class Test {
     void test() {
         A<Integer> a = new B();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt
index a85d58f3b96..3bba95749b3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.java
index 066c182e09d..94e89c1e76d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.java
@@ -1,3 +1,5 @@
+package test;
+
 class Test extends B {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt
index 3933364861d..795637eaa7b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A {
     fun foo(): Any
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.java
index 961ffef09ac..d885cbbbb60 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.java
@@ -1,3 +1,5 @@
+package test;
+
 class Test extends B {
     void test() {
         A<Integer> a = new B();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt
index cf2315839a3..f2f8226a9bc 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.java
index 3bcf0df7f73..3280b1da146 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt
index db99282bf6b..227271d3d74 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T : Comparable<T>> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.java
index 3bcf0df7f73..3280b1da146 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt
index 2f3b1bfaf05..69d6c4796a4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T : Number> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.java
index 3bcf0df7f73..3280b1da146 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt
index 3a82da93e1d..185be0adc22 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.java
index f24e11fef2e..94bbf91a9c8 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsD extends D {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt
index a0bf49b5345..5fc8d51b042 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.java
index 3bcf0df7f73..3280b1da146 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt
index c1d8b4b5ba8..816a6c0b288 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.java b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.java
index 2a33e86196a..3bf1af2068c 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.java
@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     @Override
     public Integer foo() {
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt
index 4bc87f2e664..d1e5e86a8ef 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt
@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.java
index 5abf1f4e671..c7e0497c56a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();
@@ -14,4 +16,4 @@ class JavaClass {
         catch (E1 e) {}
         catch (E2 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt
index 03fd4dd27ab..3082d0c3cba 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.java
index 111e4b136b5..4020384a4a1 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         new None();
@@ -18,4 +20,4 @@ class JavaClass {
         catch (E1 e) {}
         catch (E2 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt
index a0efb8dcd14..2dc8d185e7d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java
index 6b4397edb3b..43c028fc18b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod(One instance) {
         try {
@@ -21,13 +23,13 @@ class JavaClass {
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.one(1);
+            TestPackage.one(1);
         }
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.one$default(1, 0);
+            TestPackage.one$default(1, 0);
         }
         catch (E1 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt
index b1354708195..e2d115e4efa 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 
 throws(javaClass<E1>())
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.java
index 5abf1f4e671..c7e0497c56a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();
@@ -14,4 +16,4 @@ class JavaClass {
         catch (E1 e) {}
         catch (E2 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt
index 4e2c3cc1643..4d44f4d05f3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.java
index d32812f672c..8ea5d93374e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
         try {
@@ -5,4 +7,4 @@ class JavaClass {
         }
         catch (E1 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt
index 0e6b6994dc0..91d52577b60 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 
 trait Base<T> {
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java
index 1a8888bfa2d..ff1ece6c9bd 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java
@@ -1,16 +1,18 @@
+package test;
+
 class JavaClass {
     void testMethod() {
-        _DefaultPackage.none();
+        TestPackage.none();
 
         try {
-            _DefaultPackage.one();
+            TestPackage.one();
         }
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.two();
+            TestPackage.two();
         }
         catch (E1 e) {}
         catch (E2 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt
index fd73d8149df..abe9c217bb3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.java b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.java
index 5abf1f4e671..c7e0497c56a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.java
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.java
@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();
@@ -14,4 +16,4 @@ class JavaClass {
         catch (E1 e) {}
         catch (E2 e) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt
index 030071781d3..b8e49210b7a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt
@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
index 291a89d013c..530133698c1 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
@@ -1,5 +1,7 @@
+package test;
+
 class GenericProperty {
     void foo() {
-        java.util.Map<?, ?> o = a.APackage.getTest();
+        java.util.Map<?, ?> o = TestPackage.getTest();
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
index c4aa8df6527..6c2dde26791 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
@@ -1,6 +1,6 @@
-// Tests that type variables of properties are written to the getter signature
+package test
 
-package a
+// Tests that type variables of properties are written to the getter signature
 
 val <K, V> test: Map<K, V>
     get() = java.util.HashMap()
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.java b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.java
index ea3c35235ac..5c527a42f1a 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.java
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.java
@@ -1,3 +1,5 @@
+package test;
+
 @AString(value = Test.vstring)
 @AChar(value = Test.vchar)
 @AInt(value = Test.vint)
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt
index 3073b8ced43..b46ce6d0b98 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt
@@ -1,3 +1,5 @@
+package test
+
 annotation class AString(val value: String)
 annotation class AChar(val value: Char)
 annotation class AInt(val value: Int)
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.java b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.java
index 72eec43fb76..18e3bd2ccc3 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.java
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.java
@@ -1,3 +1,5 @@
+package test;
+
 @AString(value = Test.vstring)
 @AChar(value = Test.vchar)
 @AInt(value = Test.vint)
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt
index c784b92242c..69038739625 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt
@@ -1,3 +1,5 @@
+package test
+
 annotation class AString(val value: String)
 annotation class AChar(val value: Char)
 annotation class AInt(val value: Int)
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.java b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.java
index 936d97acf31..1dd875c56ac 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.java
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.java
@@ -1,3 +1,5 @@
+package test;
+
 public class kt3698 {
 
     @interface Foo {
@@ -8,4 +10,4 @@ public class kt3698 {
     public static void main(String[] args) {
         System.out.println(KotlinClass.FOO);
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt
index 8e836926c81..498f1cc70c9 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt
@@ -1,3 +1,5 @@
+package test
+
 class KotlinClass {
     class object {
         val FOO: Int = 10
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java
index 454f8333471..5aed7c8dbed 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java
@@ -1,3 +1,5 @@
+package test;
+
 class staticClassProperty {
 
     public static void main(String[] args) {
@@ -5,4 +7,4 @@ class staticClassProperty {
         int j = Test.varProp;
         Test.varProp = 100;
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt
index 30261421a54..7dc0ed8b136 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt
@@ -1,3 +1,5 @@
+package test
+
 class Test {
 
   class object {
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.java b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.java
index 0970136d3ba..30b548aa9e4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.java
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.java
@@ -1,6 +1,8 @@
+package test;
+
 class staticTraitProperty {
 
     public static void main(String[] args) {
         int i = Test.valProp;
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt
index ec78be164c0..3435d008743 100644
--- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt
@@ -1,3 +1,5 @@
+package test
+
 trait Test {
 
   class object {