diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
index c98a1b40a32..9ba686c31eb 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java
@@ -105,7 +105,7 @@ public class CodegenTestsOnAndroidRunner {
     /*
     Output example:
     [exec] Error in testKt344:
-    [exec] java.lang.RuntimeException: File: compiler\testData\codegen\boxWithStdlib\regressions\kt344.kt
+    [exec] java.lang.RuntimeException: File: compiler\testData\codegen\box\regressions\kt344.kt
     [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:38)
     [exec] 	at org.jetbrains.kotlin.android.tests.CodegenTestCaseOnAndroid.testKt344(CodegenTestCaseOnAndroid.java:595)
     [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
@@ -114,9 +114,9 @@ public class CodegenTestsOnAndroidRunner {
     [exec] 	at java.lang.reflect.Method.invokeNative(Native Method)
     [exec] 	at org.jetbrains.kotlin.android.tests.AbstractCodegenTestCaseOnAndroid.invokeBoxMethod(AbstractCodegenTestCaseOnAndroid.java:35)
     [exec] 	... 13 more
-    [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage$t6$foo$1
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.t6(dummy.kt:94)
-    [exec] 	at compiler_testData_codegen_boxWithStdlib_regressions_kt344_kt.Compiler_testData_codegen_boxWithStdlib_regressions_kt344_ktPackage.box(dummy.kt:185)
+    [exec] Caused by: java.lang.VerifyError: compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage$t6$foo$1
+    [exec] 	at compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage.t6(dummy.kt:94)
+    [exec] 	at compiler_testData_codegen_box_regressions_kt344_kt.Compiler_testData_codegen_box_regressions_kt344_ktPackage.box(dummy.kt:185)
     [exec] 	... 16 more
     [exec] ...............
     [exec] Error in testKt529:
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index af933374d44..55b054d2f38 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -106,7 +106,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
         p.println("public class ", testClassName, " extends ", baseTestClassName, " {");
         p.pushIndent();
 
-        generateTestMethodsForDirectories(p, new File("compiler/testData/codegen/box"), new File("compiler/testData/codegen/boxWithStdlib"));
+        generateTestMethodsForDirectories(p, new File("compiler/testData/codegen/box"));
 
         p.popIndent();
         p.println("}");
@@ -218,14 +218,9 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
                     String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_");
                     text = changePackage(packageName, text);
 
-                    if (!file.getCanonicalPath().contains("boxWithStdlib")) {
-                        CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderMock.environment.getProject());
-                        holderMock.files.add(codegenFile.getPsiFile());
-                    }
-                    else {
-                        CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderFull.environment.getProject());
-                        holderFull.files.add(codegenFile.getPsiFile());
-                    }
+                    // TODO: use holderMock when there's no WITH_RUNTIME or WITH_REFLECT in the test
+                    CodegenTestFiles codegenFile = CodegenTestFiles.create(file.getName(), text, holderFull.environment.getProject());
+                    holderFull.files.add(codegenFile.getPsiFile());
 
                     generateTestMethod(printer, generatedTestName, StringUtil.escapeStringCharacters(file.getPath()));
                 }
diff --git a/js/js.translator/testData/callableReference/function/cases/abstractClassMember.kt b/js/js.translator/testData/callableReference/function/cases/abstractClassMember.kt
index d06c57e9ea9..7d180a990e3 100644
--- a/js/js.translator/testData/callableReference/function/cases/abstractClassMember.kt
+++ b/js/js.translator/testData/callableReference/function/cases/abstractClassMember.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 abstract class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/booleanNotIntrinsic.kt b/js/js.translator/testData/callableReference/function/cases/booleanNotIntrinsic.kt
index 1366015c246..3107be2ce12 100644
--- a/js/js.translator/testData/callableReference/function/cases/booleanNotIntrinsic.kt
+++ b/js/js.translator/testData/callableReference/function/cases/booleanNotIntrinsic.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromClass.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromClass.kt
index 8c72feccd3a..28cc2cfab68 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromClass.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromClass.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromExtension.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromExtension.kt
index 6f5e67db6ef..779bfe6ac3f 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromExtension.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromExtension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringNoArgs.kt
index 324b957b0af..3e3cf396bd4 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringOneStringArg.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringOneStringArg.kt
index 23c5409bd29..5a48a350096 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringOneStringArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelStringOneStringArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitNoArgs.kt
index a10c1899391..e415bec9af9 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitOneStringArg.kt b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitOneStringArg.kt
index 88c55e2be28..a9f3fd6c6b7 100644
--- a/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitOneStringArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/classMemberFromTopLevelUnitOneStringArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/closureWithSideEffect.kt b/js/js.translator/testData/callableReference/function/cases/closureWithSideEffect.kt
index 8a341bf806b..11a7c6228ef 100644
--- a/js/js.translator/testData/callableReference/function/cases/closureWithSideEffect.kt
+++ b/js/js.translator/testData/callableReference/function/cases/closureWithSideEffect.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelNoArgs.kt
index da4eb3ae742..6f5be479f6e 100644
--- a/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelOneStringArg.kt b/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelOneStringArg.kt
index b94da65a133..efbb3afe2ac 100644
--- a/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelOneStringArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/constructorFromTopLevelOneStringArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A(val result: String)
diff --git a/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt b/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt
index 7e828bb6186..938d57f5409 100644
--- a/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt
@@ -18,4 +18,4 @@ fun box():String {
     val ref = ::A
     var result = ref(1).s + (::B)("23", "45").msg
     return (if (result == "sA:init:12345") "OK" else result)
-}
\ No newline at end of file
+}
diff --git a/js/js.translator/testData/callableReference/function/cases/extension.kt b/js/js.translator/testData/callableReference/function/cases/extension.kt
index ad6c89fab9d..7e084cc810b 100644
--- a/js/js.translator/testData/callableReference/function/cases/extension.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 class A
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromClass.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromClass.kt
index 73e780dd1e2..36deaca99d3 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromClass.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromClass.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromExtension.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromExtension.kt
index 17fab022176..2bbe6465cbb 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromExtension.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromExtension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevel.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevel.kt
index 797f52eda1d..da06de4451c 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevel.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevel.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: A, arg2: T, funRef:(A, T) -> T): T {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringNoArgs.kt
index 8b5bcd4e06e..89b8315c92b 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, funRef:A.() -> String): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringOneStringArg.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringOneStringArg.kt
index cdcb5d09a0a..0c46e14333d 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringOneStringArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelStringOneStringArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, arg2: String, funRef:A.(String) -> String): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitNoArgs.kt
index 5feb3ac7d12..857b1e24aeb 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 class A {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitOneStringArg.kt b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitOneStringArg.kt
index 025c997a3db..af1be8697f2 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitOneStringArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionFromTopLevelUnitOneStringArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg1: A, arg2: String, funRef:A.(String) -> Unit): Unit {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionToPrimitive.kt b/js/js.translator/testData/callableReference/function/cases/extensionToPrimitive.kt
index d47f70664cf..d6c8324bc5a 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionToPrimitive.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionToPrimitive.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/extensionWithClosure.kt b/js/js.translator/testData/callableReference/function/cases/extensionWithClosure.kt
index dc0bf4868f9..331ecebb61c 100644
--- a/js/js.translator/testData/callableReference/function/cases/extensionWithClosure.kt
+++ b/js/js.translator/testData/callableReference/function/cases/extensionWithClosure.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 class A
diff --git a/js/js.translator/testData/callableReference/function/cases/localLocal.kt b/js/js.translator/testData/callableReference/function/cases/localLocal.kt
index 2a0c89ec5c1..8366e393a09 100644
--- a/js/js.translator/testData/callableReference/function/cases/localLocal.kt
+++ b/js/js.translator/testData/callableReference/function/cases/localLocal.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/recursiveClosure.kt b/js/js.translator/testData/callableReference/function/cases/recursiveClosure.kt
index 5e5cdef4b54..6bda91e982b 100644
--- a/js/js.translator/testData/callableReference/function/cases/recursiveClosure.kt
+++ b/js/js.translator/testData/callableReference/function/cases/recursiveClosure.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun foo(until: Int): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/simple.kt b/js/js.translator/testData/callableReference/function/cases/simple.kt
index e96bf075f21..98c3df5eb57 100644
--- a/js/js.translator/testData/callableReference/function/cases/simple.kt
+++ b/js/js.translator/testData/callableReference/function/cases/simple.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/simpleClosure.kt b/js/js.translator/testData/callableReference/function/cases/simpleClosure.kt
index d8b8833a7a7..f32c2e69046 100644
--- a/js/js.translator/testData/callableReference/function/cases/simpleClosure.kt
+++ b/js/js.translator/testData/callableReference/function/cases/simpleClosure.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/simpleWithArg.kt b/js/js.translator/testData/callableReference/function/cases/simpleWithArg.kt
index 70a7ee4d445..7dbad42389d 100644
--- a/js/js.translator/testData/callableReference/function/cases/simpleWithArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/simpleWithArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 fun box(): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/topLevelFromClass.kt b/js/js.translator/testData/callableReference/function/cases/topLevelFromClass.kt
index a4e0c9f683e..f0896d28ce1 100644
--- a/js/js.translator/testData/callableReference/function/cases/topLevelFromClass.kt
+++ b/js/js.translator/testData/callableReference/function/cases/topLevelFromClass.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: T, arg2: T, funRef:(T,T) -> T): T {
diff --git a/js/js.translator/testData/callableReference/function/cases/topLevelFromExtension.kt b/js/js.translator/testData/callableReference/function/cases/topLevelFromExtension.kt
index c3392553b8c..07e5a304609 100644
--- a/js/js.translator/testData/callableReference/function/cases/topLevelFromExtension.kt
+++ b/js/js.translator/testData/callableReference/function/cases/topLevelFromExtension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun <T> run(arg1: T, arg2: T, funRef:(T,T) -> T): T {
diff --git a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelStringNoArgs.kt b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelStringNoArgs.kt
index 30501942f53..484652b01cf 100644
--- a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(funRef:() -> String): String {
diff --git a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelViaFunCall.kt b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelViaFunCall.kt
index 42f9fcc64e8..e1be40bba1b 100644
--- a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelViaFunCall.kt
+++ b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelViaFunCall.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg: Int, funRef:(Int) -> Int): Int {
@@ -17,4 +17,4 @@ fun box(): Boolean {
     if (run(5, tmp()) != 6) return false
 
     return true
-}
\ No newline at end of file
+}
diff --git a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelWithArg.kt b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelWithArg.kt
index d6a7f4fbd01..fa7d30c5490 100644
--- a/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelWithArg.kt
+++ b/js/js.translator/testData/callableReference/function/cases/topLevelFromTopLevelWithArg.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
 package foo
 
 fun run(arg: Int, funRef:(Int) -> Int): Int {
@@ -15,4 +15,4 @@ fun box(): Boolean {
     if (run(5) {x -> x + 1} != 6) return false
 
     return true
-}
\ No newline at end of file
+}
diff --git a/js/js.translator/testData/callableReference/function/cases/unitWithSideEffect.kt b/js/js.translator/testData/callableReference/function/cases/unitWithSideEffect.kt
index ec68be634e1..7bbe0605d18 100644
--- a/js/js.translator/testData/callableReference/function/cases/unitWithSideEffect.kt
+++ b/js/js.translator/testData/callableReference/function/cases/unitWithSideEffect.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/function/local/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
 package foo
 
 var state = 23
diff --git a/js/js.translator/testData/callableReference/property/cases/accessViaSubclass.kt b/js/js.translator/testData/callableReference/property/cases/accessViaSubclass.kt
index 57c177147de..dc3e10c6aed 100644
--- a/js/js.translator/testData/callableReference/property/cases/accessViaSubclass.kt
+++ b/js/js.translator/testData/callableReference/property/cases/accessViaSubclass.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 abstract class Base {
diff --git a/js/js.translator/testData/callableReference/property/cases/delegated.kt b/js/js.translator/testData/callableReference/property/cases/delegated.kt
index b8ae3bdb880..ecba351faea 100644
--- a/js/js.translator/testData/callableReference/property/cases/delegated.kt
+++ b/js/js.translator/testData/callableReference/property/cases/delegated.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/callableReference/property/cases/delegatedMutable.kt b/js/js.translator/testData/callableReference/property/cases/delegatedMutable.kt
index a6e1ebd7acb..aff57f9dee9 100644
--- a/js/js.translator/testData/callableReference/property/cases/delegatedMutable.kt
+++ b/js/js.translator/testData/callableReference/property/cases/delegatedMutable.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt b/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt
index 6682058120e..96657c04e68 100644
--- a/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt
+++ b/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 import kotlin.reflect.KProperty1
diff --git a/js/js.translator/testData/callableReference/property/cases/overriddenInSubclass.kt b/js/js.translator/testData/callableReference/property/cases/overriddenInSubclass.kt
index eb255bb8571..fbecf5362aa 100644
--- a/js/js.translator/testData/callableReference/property/cases/overriddenInSubclass.kt
+++ b/js/js.translator/testData/callableReference/property/cases/overriddenInSubclass.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 open class Base {
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleExtension.kt b/js/js.translator/testData/callableReference/property/cases/simpleExtension.kt
index d2ff14ba96e..75b010f77c6 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleExtension.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleExtension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 val String.id: String
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleMember.kt b/js/js.translator/testData/callableReference/property/cases/simpleMember.kt
index be229a7d209..8b82c61bd52 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleMember.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleMember.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 class A(val x: Int)
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleMutableExtension.kt b/js/js.translator/testData/callableReference/property/cases/simpleMutableExtension.kt
index 284dfdd68ed..e9975bbe4c7 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleMutableExtension.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleMutableExtension.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 var storage = 0
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleMutableMember.kt b/js/js.translator/testData/callableReference/property/cases/simpleMutableMember.kt
index 3462a324335..d040830ff42 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleMutableMember.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleMutableMember.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(var value: String)
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleMutableTopLevel.kt b/js/js.translator/testData/callableReference/property/cases/simpleMutableTopLevel.kt
index 07f1cb948ef..bbe48af0bc9 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleMutableTopLevel.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleMutableTopLevel.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(val value: String)
diff --git a/js/js.translator/testData/callableReference/property/cases/simpleTopLevel.kt b/js/js.translator/testData/callableReference/property/cases/simpleTopLevel.kt
index dcd15e00518..c7bef7b03a7 100644
--- a/js/js.translator/testData/callableReference/property/cases/simpleTopLevel.kt
+++ b/js/js.translator/testData/callableReference/property/cases/simpleTopLevel.kt
@@ -1,4 +1,4 @@
-// This test was adapted from compiler/testData/codegen/boxWithStdlib/callableReference/property/.
+// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo
 
 data class Box(val value: String)