diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1InfrastructureTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
similarity index 99%
rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1InfrastructureTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
index a73a9fe5c38..a7e06de8773 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1InfrastructureTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-public class K1InfrastructureTestGenerated extends AbstractNativeBlackBoxTest {
+public class InfrastructureTestGenerated extends AbstractNativeBlackBoxTest {
     @Nested
     @TestMetadata("native/native.tests/testData/samples")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibBinaryCompatibilityTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibBinaryCompatibilityTestGenerated.java
similarity index 98%
rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibBinaryCompatibilityTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibBinaryCompatibilityTestGenerated.java
index cb722ccdf90..7af3ced1453 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1KlibBinaryCompatibilityTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/KlibBinaryCompatibilityTestGenerated.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
 @TestMetadata("compiler/testData/binaryCompatibility/klibEvolution")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("k1KlibCompatibility")
-public class K1KlibBinaryCompatibilityTestGenerated extends AbstractNativeKlibBinaryCompatibilityTest {
+public class KlibBinaryCompatibilityTestGenerated extends AbstractNativeKlibBinaryCompatibilityTest {
     @Test
     @TestMetadata("addAbstractMemberBody.kt")
     public void testAddAbstractMemberBody() throws Exception {
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
similarity index 99%
rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
index 9ad7d46f78f..a0f53881441 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-public class K1NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest {
+public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest {
     @Nested
     @TestMetadata("compiler/testData/codegen/box")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeKLibContentsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKLibContentsTestGenerated.java
similarity index 98%
rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeKLibContentsTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKLibContentsTestGenerated.java
index 5ca29f9bbc8..80192f76e7e 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeKLibContentsTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKLibContentsTestGenerated.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
 @TestMetadata("native/native.tests/testData/klibContents")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("k1libContents")
-public class K1NativeKLibContentsTestGenerated extends AbstractNativeKlibContentsTest {
+public class NativeKLibContentsTestGenerated extends AbstractNativeKlibContentsTest {
     @Test
     public void testAllFilesPresentInKlibContents() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true);
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java
similarity index 98%
rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java
rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java
index 3769fdd00da..5d37c8d5db5 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativePartialLinkageTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/klibABI")
 @TestDataPath("$PROJECT_ROOT")
-public class K1NativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest {
+public class NativePartialLinkageTestGenerated extends AbstractNativePartialLinkageTest {
     @Test
     @TestMetadata("addEnumEntry")
     public void testAddEnumEntry() throws Exception {
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
index 3f64f25d298..0758842f101 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
@@ -24,7 +24,7 @@ fun main() {
         // Codegen box tests.
         testGroup("native/native.tests/tests-gen", "compiler/testData") {
             testClass<AbstractNativeCodegenBoxTest>(
-                suiteTestClassName = "K1NativeCodegenBoxTestGenerated",
+                suiteTestClassName = "NativeCodegenBoxTestGenerated",
                 annotations = listOf(codegen(), k1Codegen(), provider<UseExtTestCaseGroupProvider>())
             ) {
                 model("codegen/box", targetBackend = TargetBackend.NATIVE)
@@ -45,7 +45,7 @@ fun main() {
         // Samples (how to utilize the abilities of new test infrastructure).
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
             testClass<AbstractNativeBlackBoxTest>(
-                suiteTestClassName = "K1InfrastructureTestGenerated",
+                suiteTestClassName = "InfrastructureTestGenerated",
                 annotations = listOf(infrastructure(), k1Infrastructure(), provider<UseStandardTestCaseGroupProvider>())
             ) {
                 model("samples")
@@ -56,7 +56,7 @@ fun main() {
         // Partial linkage tests.
         testGroup("native/native.tests/tests-gen", "compiler/testData") {
             testClass<AbstractNativePartialLinkageTest>(
-                suiteTestClassName = "K1NativePartialLinkageTestGenerated"
+                suiteTestClassName = "NativePartialLinkageTestGenerated"
             ) {
                 model("klibABI/", pattern = "^([^_](.+))$", recursive = false)
             }
@@ -71,7 +71,7 @@ fun main() {
         // KLIB binary compatibility tests.
         testGroup("native/native.tests/tests-gen", "compiler/testData") {
             testClass<AbstractNativeKlibBinaryCompatibilityTest>(
-                suiteTestClassName = "K1KlibBinaryCompatibilityTestGenerated",
+                suiteTestClassName = "KlibBinaryCompatibilityTestGenerated",
                 annotations = listOf(k1KLibCompatibility())
             ) {
                 model("binaryCompatibility/klibEvolution", recursive = false)
@@ -111,7 +111,7 @@ fun main() {
         // Klib contents tests
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
             testClass<AbstractNativeKlibContentsTest>(
-                suiteTestClassName = "K1NativeKLibContentsTestGenerated",
+                suiteTestClassName = "NativeKLibContentsTestGenerated",
                 annotations = listOf(k1libContents())
             ) {
                 model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true)