diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java
index bfdad786f30..32dc96ba243 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJsCompilerRunnerTestGenerated.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("jps-plugin/testData/incremental/singleModule/common")
+@TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -24,21 +24,21 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
-    public void testAllFilesPresentInCommon() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+    public void testAllFilesPresentInAllPlatforms() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("touchActual")
     public void testTouchActual() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchActual/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
     }
 
     @TestMetadata("touchExpect")
     public void testTouchExpect() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchExpect/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchActual")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchActual extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -47,11 +47,11 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchActual() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchExpect")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchExpect extends AbstractIncrementalMultiplatformJsCompilerRunnerTest {
@@ -60,7 +60,7 @@ public class IncrementalMultiplatformJsCompilerRunnerTestGenerated extends Abstr
         }
 
         public void testAllFilesPresentInTouchExpect() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }
diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java
index 091f6e10544..021e22c58fa 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalMultiplatformJvmCompilerRunnerTestGenerated.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("jps-plugin/testData/incremental/singleModule/common")
+@TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -24,21 +24,21 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
-    public void testAllFilesPresentInCommon() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common"), Pattern.compile("^([^\\.]+)$"), null, true);
+    public void testAllFilesPresentInAllPlatforms() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms"), Pattern.compile("^([^\\.]+)$"), null, true);
     }
 
     @TestMetadata("touchActual")
     public void testTouchActual() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchActual/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/");
     }
 
     @TestMetadata("touchExpect")
     public void testTouchExpect() throws Exception {
-        runTest("jps-plugin/testData/incremental/singleModule/common/touchExpect/");
+        runTest("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/");
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchActual")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchActual extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -47,11 +47,11 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInTouchActual() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchActual"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 
-    @TestMetadata("jps-plugin/testData/incremental/singleModule/common/touchExpect")
+    @TestMetadata("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TouchExpect extends AbstractIncrementalMultiplatformJvmCompilerRunnerTest {
@@ -60,7 +60,7 @@ public class IncrementalMultiplatformJvmCompilerRunnerTestGenerated extends Abst
         }
 
         public void testAllFilesPresentInTouchExpect() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/singleModule/common/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect"), Pattern.compile("^([^\\.]+)$"), null, true);
         }
     }
 }
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 15906edd759..a52f4fe6673 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -1296,10 +1296,10 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractIncrementalMultiplatformJvmCompilerRunnerTest> {
-            model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
+            model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
         }
         testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
-            model("incremental/singleModule/common", extension = null, excludeParentDirs = true)
+            model("incremental/mpp/allPlatforms", extension = null, excludeParentDirs = true)
         }
     }
 
diff --git a/jps-plugin/testData/incremental/singleModule/common/README.md b/jps-plugin/testData/incremental/mpp/allPlatforms/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/README.md
rename to jps-plugin/testData/incremental/mpp/allPlatforms/README.md
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1 b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/build.log b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/build.log
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2 b/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1 b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2 b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
diff --git a/jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt b/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt
rename to jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt