diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 7390a150113..a26b40d3dd1 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -15,9 +15,8 @@ import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBoxTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBytecodeShapeTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidIrBoxTest
 import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest
-import org.jetbrains.kotlin.fir.plugin.runners.AbstractAllOpenBlackBoxCodegenTest
-import org.jetbrains.kotlin.fir.plugin.runners.AbstractFir2IrAllOpenTest
-import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirAllOpenDiagnosticTest
+import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPluginBlackBoxCodegenTest
+import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPluginDiagnosticTest
 import org.jetbrains.kotlin.generators.TestGroup
 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
@@ -384,11 +383,11 @@ fun main(args: Array<String>) {
         }
 
         testGroup("plugins/fir/fir-plugin-prototype/tests-gen", "plugins/fir/fir-plugin-prototype/testData") {
-            testClass<AbstractFirAllOpenDiagnosticTest> {
+            testClass<AbstractFirPluginDiagnosticTest> {
                 model("diagnostics")
             }
 
-            testClass<AbstractAllOpenBlackBoxCodegenTest> {
+            testClass<AbstractFirPluginBlackBoxCodegenTest> {
                 model("box")
             }
         }
diff --git a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/AllOpenBlackBoxCodegenTestGenerated.java b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java
similarity index 95%
rename from plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/AllOpenBlackBoxCodegenTestGenerated.java
rename to plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java
index b47bf6f29ee..c2c7ec0e271 100644
--- a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/AllOpenBlackBoxCodegenTestGenerated.java
+++ b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginBlackBoxCodegenTestGenerated.java
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("plugins/fir/fir-plugin-prototype/testData/box")
 @TestDataPath("$PROJECT_ROOT")
-public class AllOpenBlackBoxCodegenTestGenerated extends AbstractAllOpenBlackBoxCodegenTest {
+public class FirPluginBlackBoxCodegenTestGenerated extends AbstractFirPluginBlackBoxCodegenTest {
     @Test
     public void testAllFilesPresentInBox() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
diff --git a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirAllOpenDiagnosticTestGenerated.java b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java
similarity index 98%
rename from plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirAllOpenDiagnosticTestGenerated.java
rename to plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java
index 47184fb2e92..4a5f6c6d8b0 100644
--- a/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirAllOpenDiagnosticTestGenerated.java
+++ b/plugins/fir/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirPluginDiagnosticTestGenerated.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("plugins/fir/fir-plugin-prototype/testData/diagnostics")
 @TestDataPath("$PROJECT_ROOT")
-public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnosticTest {
+public class FirPluginDiagnosticTestGenerated extends AbstractFirPluginDiagnosticTest {
     @Test
     public void testAllFilesPresentInDiagnostics() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
diff --git a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractAllOpenBlackBoxCodegenTest.kt b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
similarity index 92%
rename from plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractAllOpenBlackBoxCodegenTest.kt
rename to plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
index 0f28b7627e6..8f690746144 100644
--- a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractAllOpenBlackBoxCodegenTest.kt
+++ b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.builders.irHandlersStep
 import org.jetbrains.kotlin.test.builders.jvmArtifactsHandlersStep
 import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
 
-open class AbstractAllOpenBlackBoxCodegenTest : AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR) {
+open class AbstractFirPluginBlackBoxCodegenTest : AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR) {
     override fun TestConfigurationBuilder.configuration() {
         commonFirWithPluginFrontendConfiguration()
         fir2IrStep()
diff --git a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirAllOpenDiagnosticTest.kt b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
similarity index 86%
rename from plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirAllOpenDiagnosticTest.kt
rename to plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
index 8134a94f46a..f2a37baf7ef 100644
--- a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirAllOpenDiagnosticTest.kt
+++ b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.plugin.runners
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
 
-abstract class AbstractFirAllOpenDiagnosticTest : AbstractKotlinCompilerTest() {
+abstract class AbstractFirPluginDiagnosticTest : AbstractKotlinCompilerTest() {
     override fun TestConfigurationBuilder.configuration() {
         commonFirWithPluginFrontendConfiguration()
     }