diff --git a/idea/testData/multiModuleHighlighting/platform1/header/header.kt b/idea/testData/multiModuleHighlighting/platformBasic/header/header.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform1/header/header.kt
rename to idea/testData/multiModuleHighlighting/platformBasic/header/header.kt
diff --git a/idea/testData/multiModuleHighlighting/platform1/jvm/jvm.kt b/idea/testData/multiModuleHighlighting/platformBasic/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform1/jvm/jvm.kt
rename to idea/testData/multiModuleHighlighting/platformBasic/jvm/jvm.kt
diff --git a/idea/testData/multiModuleHighlighting/platform2/header/header.kt b/idea/testData/multiModuleHighlighting/platformClass/header/header.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform2/header/header.kt
rename to idea/testData/multiModuleHighlighting/platformClass/header/header.kt
diff --git a/idea/testData/multiModuleHighlighting/platform2/jvm/jvm.kt b/idea/testData/multiModuleHighlighting/platformClass/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform2/jvm/jvm.kt
rename to idea/testData/multiModuleHighlighting/platformClass/jvm/jvm.kt
diff --git a/idea/testData/multiModuleHighlighting/platform5/header/header.kt b/idea/testData/multiModuleHighlighting/platformFunctionProperty/header/header.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform5/header/header.kt
rename to idea/testData/multiModuleHighlighting/platformFunctionProperty/header/header.kt
diff --git a/idea/testData/multiModuleHighlighting/platform5/jvm/jvm.kt b/idea/testData/multiModuleHighlighting/platformFunctionProperty/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform5/jvm/jvm.kt
rename to idea/testData/multiModuleHighlighting/platformFunctionProperty/jvm/jvm.kt
diff --git a/idea/testData/multiModuleHighlighting/platform3/header/header.kt b/idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/header/header.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform3/header/header.kt
rename to idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/header/header.kt
diff --git a/idea/testData/multiModuleHighlighting/platform3/js/dummy.kt b/idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/js/dummy.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform3/js/dummy.kt
rename to idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/js/dummy.kt
diff --git a/idea/testData/multiModuleHighlighting/platform3/jvm/dummy.kt b/idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/jvm/dummy.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform3/jvm/dummy.kt
rename to idea/testData/multiModuleHighlighting/platformNotImplementedForBoth/jvm/dummy.kt
diff --git a/idea/testData/multiModuleHighlighting/platform4/header/header.kt b/idea/testData/multiModuleHighlighting/platformPartiallyImplemented/header/header.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform4/header/header.kt
rename to idea/testData/multiModuleHighlighting/platformPartiallyImplemented/header/header.kt
diff --git a/idea/testData/multiModuleHighlighting/platform4/jvm/jvm.kt b/idea/testData/multiModuleHighlighting/platformPartiallyImplemented/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleHighlighting/platform4/jvm/jvm.kt
rename to idea/testData/multiModuleHighlighting/platformPartiallyImplemented/jvm/jvm.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
index 7627ffcdd90..c74166b1d39 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
@@ -60,7 +60,7 @@ class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         checkHighlightingInAllFiles()
     }
 
-    fun testPlatform1() {
+    fun testPlatformBasic() {
         val header = module("header")
         header.setPlatformKind(TargetPlatformKind.Common)
 
@@ -72,7 +72,7 @@ class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         checkHighlightingInAllFiles()
     }
 
-    fun testPlatform2() {
+    fun testPlatformClass() {
         val header = module("header")
         header.setPlatformKind(TargetPlatformKind.Common)
 
@@ -84,7 +84,7 @@ class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         checkHighlightingInAllFiles()
     }
 
-    fun testPlatform3() {
+    fun testPlatformNotImplementedForBoth() {
         val header = module("header")
         header.setPlatformKind(TargetPlatformKind.Common)
 
@@ -101,7 +101,7 @@ class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         checkHighlightingInAllFiles()
     }
 
-    fun testPlatform4() {
+    fun testPlatformPartiallyImplemented() {
         val header = module("header")
         header.setPlatformKind(TargetPlatformKind.Common)
 
@@ -113,7 +113,7 @@ class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         checkHighlightingInAllFiles()
     }
 
-    fun testPlatform5() {
+    fun testPlatformFunctionProperty() {
         val header = module("header")
         header.setPlatformKind(TargetPlatformKind.Common)