diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java
rename to compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
index 3a89df8e636..29962756107 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
@@ -36,7 +36,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public abstract class AbstractKotlinLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
+public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
     private static final Pattern SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE);
 
     @Override
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
similarity index 96%
rename from compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
index 71c39c22202..55f8d01c628 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 @TestMetadata("compiler/testData/asJava/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest {
+public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassTest {
     public void testAllFilesPresentInLightClasses() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true);
     }
@@ -38,7 +38,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Delegation extends AbstractKotlinLightClassTest {
+    public static class Delegation extends AbstractCompilerLightClassTest {
         public void testAllFilesPresentInDelegation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -65,7 +65,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     @TestMetadata("compiler/testData/asJava/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Facades extends AbstractKotlinLightClassTest {
+    public static class Facades extends AbstractCompilerLightClassTest {
         public void testAllFilesPresentInFacades() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -86,7 +86,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class NullabilityAnnotations extends AbstractKotlinLightClassTest {
+    public static class NullabilityAnnotations extends AbstractCompilerLightClassTest {
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -215,7 +215,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     @TestMetadata("compiler/testData/asJava/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Object extends AbstractKotlinLightClassTest {
+    public static class Object extends AbstractCompilerLightClassTest {
         public void testAllFilesPresentInObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true);
         }
@@ -230,7 +230,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class PublicField extends AbstractKotlinLightClassTest {
+    public static class PublicField extends AbstractCompilerLightClassTest {
         public void testAllFilesPresentInPublicField() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true);
         }
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java
index a93682f3488..f57061cedc4 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java
@@ -51,7 +51,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
     protected void setUp() throws Exception {
         super.setUp();
 
-        finder = AbstractKotlinLightClassTest.createFinder(getEnvironment());
+        finder = AbstractCompilerLightClassTest.createFinder(getEnvironment());
     }
 
     @Override
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 5a0d4219d34..0220a5319a6 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.AbstractDataFlowValueRenderingTest
 import org.jetbrains.kotlin.addImport.AbstractAddImportTest
 import org.jetbrains.kotlin.android.*
 import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest
-import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest
+import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest
 import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
 import org.jetbrains.kotlin.cfg.AbstractDataFlowTest
 import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest
@@ -324,7 +324,7 @@ fun main(args: Array<String>) {
             model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest")
         }
 
-        testClass<AbstractKotlinLightClassTest>() {
+        testClass<AbstractCompilerLightClassTest>() {
             model("asJava/lightClasses")
         }