diff --git a/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java b/compiler/testData/codegen/boxWithJava/jvmName/FakePlatformName.java
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.java
rename to compiler/testData/codegen/boxWithJava/jvmName/FakePlatformName.java
diff --git a/compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.kt b/compiler/testData/codegen/boxWithJava/jvmName/FakePlatformName.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformName/FakePlatformName.kt
rename to compiler/testData/codegen/boxWithJava/jvmName/FakePlatformName.kt
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/Test.java b/compiler/testData/codegen/boxWithJava/jvmStatic/annotations/Test.java
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/annotations/Test.java
rename to compiler/testData/codegen/boxWithJava/jvmStatic/annotations/Test.java
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/annotations/simpleClassObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt
rename to compiler/testData/codegen/boxWithJava/jvmStatic/annotations/simpleClassObject.kt
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/Test.java b/compiler/testData/codegen/boxWithJava/jvmStatic/classObject/Test.java
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/classObject/Test.java
rename to compiler/testData/codegen/boxWithJava/jvmStatic/classObject/Test.java
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/classObject/simpleClassObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt
rename to compiler/testData/codegen/boxWithJava/jvmStatic/classObject/simpleClassObject.kt
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/Test.java b/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/Test.java
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/Test.java
rename to compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/Test.java
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/enumCompanionObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt
rename to compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/enumCompanionObject.kt
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/object/Test.java b/compiler/testData/codegen/boxWithJava/jvmStatic/object/Test.java
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/object/Test.java
rename to compiler/testData/codegen/boxWithJava/jvmStatic/object/Test.java
diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt b/compiler/testData/codegen/boxWithJava/jvmStatic/object/simpleObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt
rename to compiler/testData/codegen/boxWithJava/jvmStatic/object/simpleObject.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/classMembers.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/classMembers.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/multifileClass.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/multifileClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/multifileClass.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/multifileClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalClass.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalClass.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalGeneric.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalGeneric.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalGeneric.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalGeneric.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt b/compiler/testData/codegen/boxWithStdlib/jvmName/renamedFileClass.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmName/renamedFileClass.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/closure.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/closure.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/convention.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/convention.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/default.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/default.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/explicitObject.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/explicitObject.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/funAccess.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/funAccess.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/importStaticMemberFromObject.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/importStaticMemberFromObject.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/importStaticMemberFromObject.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/importStaticMemberFromObject.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/inline.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/inline.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/postfixInc.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/postfixInc.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/prefixInc.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/prefixInc.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/privateMethod.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/privateMethod.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAccess.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAccess.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAsDefault.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAsDefault.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/simple.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/simple.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt
diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt b/compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt
similarity index 100%
rename from compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt
rename to compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
index 0302275fddc..22af32a5ef4 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
@@ -83,6 +83,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
         doTestWithJava(fileName);
     }
 
+    @TestMetadata("jvmName")
+    public void testJvmName() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmName/");
+        doTestWithJava(fileName);
+    }
+
     @TestMetadata("mangling")
     public void testMangling() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/mangling/");
@@ -95,12 +101,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
         doTestWithJava(fileName);
     }
 
-    @TestMetadata("platformName")
-    public void testPlatformName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/platformName/");
-        doTestWithJava(fileName);
-    }
-
     @TestMetadata("compiler/testData/codegen/boxWithJava/annotatedFileClasses")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -347,6 +347,40 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
 
     }
 
+    @TestMetadata("compiler/testData/codegen/boxWithJava/jvmStatic")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmStatic extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInJvmStatic() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmStatic"), Pattern.compile("^([^\\.]+)$"), true);
+        }
+
+        @TestMetadata("annotations")
+        public void testAnnotations() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/annotations/");
+            doTestWithJava(fileName);
+        }
+
+        @TestMetadata("classObject")
+        public void testClassObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/classObject/");
+            doTestWithJava(fileName);
+        }
+
+        @TestMetadata("enumCompanion")
+        public void testEnumCompanion() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/");
+            doTestWithJava(fileName);
+        }
+
+        @TestMetadata("object")
+        public void testObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/object/");
+            doTestWithJava(fileName);
+        }
+
+    }
+
     @TestMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -363,40 +397,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
 
     }
 
-    @TestMetadata("compiler/testData/codegen/boxWithJava/platformStatic")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PlatformStatic extends AbstractBlackBoxCodegenTest {
-        public void testAllFilesPresentInPlatformStatic() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/platformStatic"), Pattern.compile("^([^\\.]+)$"), true);
-        }
-
-        @TestMetadata("annotations")
-        public void testAnnotations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/platformStatic/annotations/");
-            doTestWithJava(fileName);
-        }
-
-        @TestMetadata("classObject")
-        public void testClassObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/platformStatic/classObject/");
-            doTestWithJava(fileName);
-        }
-
-        @TestMetadata("enumCompanion")
-        public void testEnumCompanion() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/");
-            doTestWithJava(fileName);
-        }
-
-        @TestMetadata("object")
-        public void testObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/platformStatic/object/");
-            doTestWithJava(fileName);
-        }
-
-    }
-
     @TestMetadata("compiler/testData/codegen/boxWithJava/properties")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index 49c0ff1a03f..22d5842cb74 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -2081,6 +2081,69 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxWithStdlib/jvmName")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmName extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInJvmName() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmName"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("callableReference.kt")
+        public void testCallableReference() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("clashingErasure.kt")
+        public void testClashingErasure() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("classMembers.kt")
+        public void testClassMembers() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("functionName.kt")
+        public void testFunctionName() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("multifileClass.kt")
+        public void testMultifileClass() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClass.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("multifileClassWithLocalClass.kt")
+        public void testMultifileClassWithLocalClass() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalClass.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("multifileClassWithLocalGeneric.kt")
+        public void testMultifileClassWithLocalGeneric() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalGeneric.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("propertyName.kt")
+        public void testPropertyName() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("renamedFileClass.kt")
+        public void testRenamedFileClass() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/renamedFileClass.kt");
+            doTestWithStdlib(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2144,6 +2207,99 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class JvmStatic extends AbstractBlackBoxCodegenTest {
+        public void testAllFilesPresentInJvmStatic() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("closure.kt")
+        public void testClosure() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("convention.kt")
+        public void testConvention() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("default.kt")
+        public void testDefault() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("explicitObject.kt")
+        public void testExplicitObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("funAccess.kt")
+        public void testFunAccess() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("importStaticMemberFromObject.kt")
+        public void testImportStaticMemberFromObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/importStaticMemberFromObject.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("inline.kt")
+        public void testInline() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("postfixInc.kt")
+        public void testPostfixInc() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("prefixInc.kt")
+        public void testPrefixInc() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("privateMethod.kt")
+        public void testPrivateMethod() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("propertyAccess.kt")
+        public void testPropertyAccess() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("propertyAsDefault.kt")
+        public void testPropertyAsDefault() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt");
+            doTestWithStdlib(fileName);
+        }
+
+        @TestMetadata("syntheticAccessor.kt")
+        public void testSyntheticAccessor() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt");
+            doTestWithStdlib(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2450,162 +2606,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/boxWithStdlib/platformNames")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PlatformNames extends AbstractBlackBoxCodegenTest {
-        public void testAllFilesPresentInPlatformNames() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("callableReference.kt")
-        public void testCallableReference() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("clashingErasure.kt")
-        public void testClashingErasure() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("classMembers.kt")
-        public void testClassMembers() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/classMembers.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("functionName.kt")
-        public void testFunctionName() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("multifileClass.kt")
-        public void testMultifileClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/multifileClass.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("multifileClassWithLocalClass.kt")
-        public void testMultifileClassWithLocalClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalClass.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("multifileClassWithLocalGeneric.kt")
-        public void testMultifileClassWithLocalGeneric() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/multifileClassWithLocalGeneric.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("propertyName.kt")
-        public void testPropertyName() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("renamedFileClass.kt")
-        public void testRenamedFileClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/renamedFileClass.kt");
-            doTestWithStdlib(fileName);
-        }
-    }
-
-    @TestMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class PlatformStatic extends AbstractBlackBoxCodegenTest {
-        public void testAllFilesPresentInPlatformStatic() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("closure.kt")
-        public void testClosure() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/closure.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("convention.kt")
-        public void testConvention() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/convention.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("default.kt")
-        public void testDefault() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/default.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("explicitObject.kt")
-        public void testExplicitObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/explicitObject.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("funAccess.kt")
-        public void testFunAccess() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/funAccess.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("importStaticMemberFromObject.kt")
-        public void testImportStaticMemberFromObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/importStaticMemberFromObject.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("inline.kt")
-        public void testInline() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/inline.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("postfixInc.kt")
-        public void testPostfixInc() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/postfixInc.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("prefixInc.kt")
-        public void testPrefixInc() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/prefixInc.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("privateMethod.kt")
-        public void testPrivateMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/privateMethod.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("propertyAccess.kt")
-        public void testPropertyAccess() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAccess.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("propertyAsDefault.kt")
-        public void testPropertyAsDefault() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAsDefault.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/simple.kt");
-            doTestWithStdlib(fileName);
-        }
-
-        @TestMetadata("syntheticAccessor.kt")
-        public void testSyntheticAccessor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt");
-            doTestWithStdlib(fileName);
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/privateConstructor")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)