diff --git a/.idea/modules.xml b/.idea/modules.xml
index e187ce05c7dc..9690ab968904 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1612,9 +1612,9 @@
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/plugin/intellij.platform.structuralSearch.plugin.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/plugin/intellij.platform.structuralSearch.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.impl.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/plugin/intellij.platform.structureView.plugin.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/plugin/intellij.platform.structureView.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/syntax/syntax-api/intellij.platform.syntax.iml" filepath="$PROJECT_DIR$/platform/syntax/syntax-api/intellij.platform.syntax.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/syntax/syntax-extensions/intellij.platform.syntax.extensions.iml" filepath="$PROJECT_DIR$/platform/syntax/syntax-extensions/intellij.platform.syntax.extensions.iml" />
diff --git a/grid/impl/BUILD.bazel b/grid/impl/BUILD.bazel
index bc34e8757551..dbf0b66eff57 100644
--- a/grid/impl/BUILD.bazel
+++ b/grid/impl/BUILD.bazel
@@ -57,7 +57,7 @@ jvm_library(
         "//libraries/fastutil",
         "//platform/diff-api:diff",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//xml/xml-parser:parser",
         "//platform/ide-core-impl",
         "//platform/refactoring",
@@ -115,7 +115,7 @@ jvm_library(
         "//libraries/fastutil:fastutil_test_lib",
         "//platform/diff-api:diff_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//xml/xml-parser:parser_test_lib",
         "//platform/ide-core-impl:ide-core-impl_test_lib",
         "//platform/refactoring:refactoring_test_lib",
diff --git a/grid/impl/intellij.grid.impl.iml b/grid/impl/intellij.grid.impl.iml
index f718d71cf917..87996fd2caa1 100644
--- a/grid/impl/intellij.grid.impl.iml
+++ b/grid/impl/intellij.grid.impl.iml
@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -48,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
diff --git a/grid/impl/resources/intellij.grid.impl.xml b/grid/impl/resources/intellij.grid.impl.xml
index 6c47a24c7412..c9dfcc49dbf8 100644
--- a/grid/impl/resources/intellij.grid.impl.xml
+++ b/grid/impl/resources/intellij.grid.impl.xml
@@ -29,7 +29,7 @@
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.projectModel.impl"/>
     <module name="intellij.platform.statistics"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.coroutines"/>
     <module name="intellij.platform.util.ui"/>
     <module name="intellij.xml.parser"/>
diff --git a/java/java-impl-refactorings/BUILD.bazel b/java/java-impl-refactorings/BUILD.bazel
index ccf693805ff8..d3288c5ecf77 100644
--- a/java/java-impl-refactorings/BUILD.bazel
+++ b/java/java-impl-refactorings/BUILD.bazel
@@ -46,7 +46,7 @@ jvm_library(
         "//java/java-psi-impl:psi-impl",
         "//java/java-impl:impl",
         "//java/jsp-openapi:jsp",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/usageView",
         "//platform/ide-core-impl",
         "//platform/ide-core",
@@ -108,7 +108,7 @@ jvm_library(
         "//java/java-psi-impl:psi-impl_test_lib",
         "//java/java-impl:impl_test_lib",
         "//java/jsp-openapi:jsp_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView:usageView_test_lib",
         "//platform/ide-core-impl:ide-core-impl_test_lib",
         "//platform/ide-core:ide-core_test_lib",
diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
index 9eb73b42953e..046bfc0d9507 100644
--- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
@@ -34,7 +34,7 @@
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.jsp" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
diff --git a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
index e84b40ff9dfe..72fa2b6904d5 100644
--- a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
+++ b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
@@ -11,7 +11,7 @@
     <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.jsp"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
 
diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel
index 9e221808ca7c..e7daad78d4f7 100644
--- a/java/java-impl/BUILD.bazel
+++ b/java/java-impl/BUILD.bazel
@@ -57,7 +57,7 @@ jvm_library(
         "//platform/macro",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/usageView-impl",
         "//platform/util",
         "//java/openapi:java",
@@ -215,8 +215,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//platform/util",
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index c315f8d748bd..75eb93e93dfb 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -48,7 +48,7 @@
     <orderEntry type="module" module-name="intellij.platform.macro" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.java" exported="" />
diff --git a/java/java-impl/resources/intellij.java.impl.xml b/java/java-impl/resources/intellij.java.impl.xml
index 91bfb6cd2916..e2c3c2e2217b 100644
--- a/java/java-impl/resources/intellij.java.impl.xml
+++ b/java/java-impl/resources/intellij.java.impl.xml
@@ -24,7 +24,7 @@
     <module name="intellij.java.structureView"/>
     <module name="intellij.jsp"/>
     <module name="intellij.jsp.spi"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.todo"/>
     <module name="intellij.spellchecker"/>
   </dependencies>
diff --git a/java/java-structure-view/BUILD.bazel b/java/java-structure-view/BUILD.bazel
index 0ecaa55ee495..0287934f92ba 100644
--- a/java/java-structure-view/BUILD.bazel
+++ b/java/java-structure-view/BUILD.bazel
@@ -23,7 +23,7 @@ jvm_library(
         "//platform/core-api:core",
         "//platform/core-impl",
         "//platform/editor-ui-api:editor-ui",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//java/java-psi-api:psi",
         "//java/java-psi-impl:psi-impl",
         "//platform/util:util-ui",
@@ -49,7 +49,7 @@ jvm_library(
         "//platform/core-api:core_test_lib",
         "//platform/core-impl:core-impl_test_lib",
         "//platform/editor-ui-api:editor-ui_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//java/java-psi-api:psi_test_lib",
         "//java/java-psi-impl:psi-impl_test_lib",
         "//platform/util:util-ui_test_lib",
diff --git a/java/java-structure-view/intellij.java.structureView.iml b/java/java-structure-view/intellij.java.structureView.iml
index 3da65f5175e0..645c9e4d54f7 100644
--- a/java/java-structure-view/intellij.java.structureView.iml
+++ b/java/java-structure-view/intellij.java.structureView.iml
@@ -11,7 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
diff --git a/java/java-structure-view/resources/intellij.java.structureView.xml b/java/java-structure-view/resources/intellij.java.structureView.xml
index 5767842f921c..3bf803bb0362 100644
--- a/java/java-structure-view/resources/intellij.java.structureView.xml
+++ b/java/java-structure-view/resources/intellij.java.structureView.xml
@@ -5,7 +5,7 @@
     <module name="intellij.java.psi.impl"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.java.analysis.impl"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
 </idea-plugin>
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index 82df0b38d4ce..01ac9606c22c 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -141,8 +141,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/structure-view-impl/frontend",
         "//platform/structure-view-impl/frontend:frontend_test_lib",
         "//platform/structure-view-impl/backend",
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 7c41def95894..42471e539245 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.lvcs" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.frontend" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.backend" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel
index 508e0318eeed..286eee89ab64 100644
--- a/java/testFramework/BUILD.bazel
+++ b/java/testFramework/BUILD.bazel
@@ -44,7 +44,7 @@ jvm_library(
         "//platform/lang-core",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util",
         "//libraries/junit4",
         "//platform/util/jdom",
@@ -132,7 +132,7 @@ jvm_library(
         "//platform/lang-core:lang-core_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util:util_test_lib",
         "//libraries/junit4:junit4_test_lib",
         "//platform/util/jdom:jdom_test_lib",
@@ -289,8 +289,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util",
         "//platform/util:util_test_lib",
         "//libraries/junit4",
diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml
index 97a40fb3bdca..c6a2dc939f79 100644
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.libraries.junit4" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
diff --git a/java/testFramework/intellij.java.testFramework.tests.iml b/java/testFramework/intellij.java.testFramework.tests.iml
index 3d6e0acc1efd..900f62228d1d 100644
--- a/java/testFramework/intellij.java.testFramework.tests.iml
+++ b/java/testFramework/intellij.java.testFramework.tests.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
diff --git a/java/testFramework/resources/intellij.java.testFramework.xml b/java/testFramework/resources/intellij.java.testFramework.xml
index 52695f9d5f96..59e1094ea216 100644
--- a/java/testFramework/resources/intellij.java.testFramework.xml
+++ b/java/testFramework/resources/intellij.java.testFramework.xml
@@ -24,7 +24,7 @@
     <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.problemsView.backend"/>
     <module name="intellij.platform.projectModel"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.ui"/>
     <module name="intellij.xml.parser"/>
     <module name="intellij.xml.psi"/>
diff --git a/json/backend/tests/BUILD.bazel b/json/backend/tests/BUILD.bazel
index ddb71c5dd230..ad0b7c1fc765 100644
--- a/json/backend/tests/BUILD.bazel
+++ b/json/backend/tests/BUILD.bazel
@@ -108,8 +108,8 @@ jvm_library(
         "//platform/util/jdom:jdom_test_lib",
         "//platform/util:util-ui",
         "//platform/util:util-ui_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//libraries/fastutil",
         "//libraries/fastutil:fastutil_test_lib",
         "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
diff --git a/json/backend/tests/intellij.json.tests.iml b/json/backend/tests/intellij.json.tests.iml
index edf182ab80df..f874fe93f308 100644
--- a/json/backend/tests/intellij.json.tests.iml
+++ b/json/backend/tests/intellij.json.tests.iml
@@ -42,7 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
diff --git a/json/structureView/BUILD.bazel b/json/structureView/BUILD.bazel
index 896a67cd65dc..ceb99bd2798b 100644
--- a/json/structureView/BUILD.bazel
+++ b/json/structureView/BUILD.bazel
@@ -26,7 +26,7 @@ jvm_library(
         "//platform/core-api:core",
         "//platform/editor-ui-api:editor-ui",
         "//platform/lang-api:lang",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util",
     ],
 )
@@ -48,7 +48,7 @@ jvm_library(
         "//platform/core-api:core_test_lib",
         "//platform/editor-ui-api:editor-ui_test_lib",
         "//platform/lang-api:lang_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util:util_test_lib",
     ],
 )
diff --git a/json/structureView/intellij.json.structureView.iml b/json/structureView/intellij.json.structureView.iml
index 82189c086003..70cf2570440d 100644
--- a/json/structureView/intellij.json.structureView.iml
+++ b/json/structureView/intellij.json.structureView.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/json/structureView/resources/intellij.json.structureView.xml b/json/structureView/resources/intellij.json.structureView.xml
index 89f86bd1cec0..105a67785e8c 100644
--- a/json/structureView/resources/intellij.json.structureView.xml
+++ b/json/structureView/resources/intellij.json.structureView.xml
@@ -3,7 +3,7 @@
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.json"/>
     <module name="intellij.json.backend"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <!-- endregion -->
   </dependencies>
 
diff --git a/module-set-plugins/generated/intellij.moduleSet.plugin.main/BUILD.bazel b/module-set-plugins/generated/intellij.moduleSet.plugin.main/BUILD.bazel
index 4d5f74771fcc..abb438f17af3 100644
--- a/module-set-plugins/generated/intellij.moduleSet.plugin.main/BUILD.bazel
+++ b/module-set-plugins/generated/intellij.moduleSet.plugin.main/BUILD.bazel
@@ -39,7 +39,7 @@ jvm_library(
         "//platform/structuralsearch:structuralSearch",
         "//platform/structure-view-impl/backend",
         "//platform/structure-view-impl/frontend",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/todo",
         "//platform/todo/backend",
         "//platform/vcs-impl/frontend",
@@ -90,7 +90,7 @@ jvm_library(
         "//platform/structuralsearch:structuralSearch_test_lib",
         "//platform/structure-view-impl/backend:backend_test_lib",
         "//platform/structure-view-impl/frontend:frontend_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/todo:todo_test_lib",
         "//platform/todo/backend:backend_test_lib",
         "//platform/vcs-impl/frontend:frontend_test_lib",
diff --git a/module-set-plugins/generated/intellij.moduleSet.plugin.main/intellij.moduleSet.plugin.main.iml b/module-set-plugins/generated/intellij.moduleSet.plugin.main/intellij.moduleSet.plugin.main.iml
index e81b55b9cef9..f365bf6ae93d 100644
--- a/module-set-plugins/generated/intellij.moduleSet.plugin.main/intellij.moduleSet.plugin.main.iml
+++ b/module-set-plugins/generated/intellij.moduleSet.plugin.main/intellij.moduleSet.plugin.main.iml
@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.structuralSearch" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.structureView.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.structureView.frontend" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.todo" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.todo.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.frontend" scope="RUNTIME" />
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ProductPluginInitContext.kt b/platform/core-impl/src/com/intellij/ide/plugins/ProductPluginInitContext.kt
index 7bac71d75c53..579b1bfdf521 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/ProductPluginInitContext.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/ProductPluginInitContext.kt
@@ -388,7 +388,7 @@ private val XDEBUGGER_MODULE_IDS = listOf(
 )
 private val externalNonBundledPluginCompatibilityDependencies = listOf(
   "intellij.libraries.groovy",
-  "intellij.platform.structureView.impl",
+  "intellij.platform.structureView",
   "intellij.platform.todo",
   "intellij.platform.bookmarks",
   "intellij.platform.smRunner",
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index a1a55bceb6ca..58df966caf07 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -320,7 +320,7 @@ jvm_library(
         "//platform/projectModel-impl",
         "//platform/ide-core-impl",
         "//platform/analysis-impl",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
     ],
     runtime_deps = [
         # do not sort,
@@ -342,7 +342,7 @@ jvm_library(
         "//libraries/gson",
         "//jps/model-impl",
         "//platform/analysis-impl",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//libraries/commons/logging",
         "//libraries/jackson3/jackson:libraries-jackson3",
         "//libraries/jackson3/databind",
@@ -384,8 +384,8 @@ jvm_library(
         "//platform/ide-core-impl:ide-core-impl_test_lib",
         "//platform/analysis-impl",
         "//platform/analysis-impl:analysis-impl_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
     ],
     runtime_deps = [
         # do not sort,
@@ -459,8 +459,8 @@ jvm_library(
         "//jps/model-impl:model-impl_test_lib",
         "//platform/analysis-impl",
         "//platform/analysis-impl:analysis-impl_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//libraries/commons/logging",
         "//libraries/commons/logging:logging_test_lib",
         "//platform/testFramework",
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index b06232da4ab5..5e4747dfdb57 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -61,7 +61,7 @@
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" exported="" />
     <orderEntry type="module" module-name="intellij.libraries.commons.logging" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
diff --git a/platform/lsp-impl/structureView/BUILD.bazel b/platform/lsp-impl/structureView/BUILD.bazel
index 34caa512b92f..77ae13d80f4d 100644
--- a/platform/lsp-impl/structureView/BUILD.bazel
+++ b/platform/lsp-impl/structureView/BUILD.bazel
@@ -31,7 +31,7 @@ jvm_library(
         "//platform/lang-impl",
         "//platform/lsp",
         "//platform/lsp-impl",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util:util-ui",
     ],
 )
@@ -57,7 +57,7 @@ jvm_library(
         "//platform/lang-impl:lang-impl_test_lib",
         "//platform/lsp:lsp_test_lib",
         "//platform/lsp-impl:lsp-impl_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util:util-ui_test_lib",
     ],
 )
diff --git a/platform/lsp-impl/structureView/intellij.platform.lsp.impl.structureView.iml b/platform/lsp-impl/structureView/intellij.platform.lsp.impl.structureView.iml
index ff57cfb4b0cd..3726db786311 100644
--- a/platform/lsp-impl/structureView/intellij.platform.lsp.impl.structureView.iml
+++ b/platform/lsp-impl/structureView/intellij.platform.lsp.impl.structureView.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.lsp" />
     <orderEntry type="module" module-name="intellij.platform.lsp.impl" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/lsp-impl/structureView/resources/intellij.platform.lsp.impl.structureView.xml b/platform/lsp-impl/structureView/resources/intellij.platform.lsp.impl.structureView.xml
index 18c0f8cdbd3f..2a9f3b223b10 100644
--- a/platform/lsp-impl/structureView/resources/intellij.platform.lsp.impl.structureView.xml
+++ b/platform/lsp-impl/structureView/resources/intellij.platform.lsp.impl.structureView.xml
@@ -9,7 +9,7 @@
     <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.lsp"/>
     <module name="intellij.platform.lsp.impl"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.ui"/>
   </dependencies>
 
diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel
index 02d91f191094..c6975efbebf3 100644
--- a/platform/platform-tests/BUILD.bazel
+++ b/platform/platform-tests/BUILD.bazel
@@ -135,8 +135,8 @@ jvm_library(
         "//platform/refactoring:refactoring_test_lib",
         "//platform/remote-core",
         "//platform/remote-core:remote-core_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//platform/util/diff",
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 4c08f7590c7a..a22a022b6ba0 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -34,7 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectFrame" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.remote.core" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDependenciesTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDependenciesTest.kt
index bb2eff7fb3ac..db50f6edf835 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDependenciesTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDependenciesTest.kt
@@ -1132,7 +1132,7 @@ internal class PluginDependenciesTest {
     fun `external non bundled descriptors get implicit compatibility modules`() {
       val compatibilityModuleIds = listOf(
         "intellij.libraries.groovy",
-        "intellij.platform.structureView.impl",
+        "intellij.platform.structureView",
         "intellij.platform.todo",
       )
       plugin("compatibility.modules.provider") {
diff --git a/platform/structure-view-impl/BUILD.bazel b/platform/structure-view-impl/BUILD.bazel
index 9853b290b317..68ee5085c617 100644
--- a/platform/structure-view-impl/BUILD.bazel
+++ b/platform/structure-view-impl/BUILD.bazel
@@ -1,9 +1,9 @@
 load("@rules_jvm//:jvm.bzl", "jvm_library")
 
-### auto-generated section `build intellij.platform.structureView.impl` start
+### auto-generated section `build intellij.platform.structureView` start
 
 jvm_library(
-    name = "structureView-impl",
+    name = "structureView",
     srcs = glob(
         [
             "src/**/*.kt",
@@ -12,7 +12,7 @@ jvm_library(
         ],
         allow_empty = True,
     ),
-    module_name = "intellij.platform.structureView.impl",
+    module_name = "intellij.platform.structureView",
     resource_strip_prefix = "resources",
     resources = glob(
         ["resources/**/*"],
@@ -55,13 +55,13 @@ jvm_library(
 )
 
 jvm_library(
-    name = "structureView-impl_test_lib",
+    name = "structureView_test_lib",
     testonly = True,
     srcs = glob(
         [],
         allow_empty = True,
     ),
-    module_name = "intellij.platform.structureView.impl",
+    module_name = "intellij.platform.structureView",
     visibility = ["//visibility:public"],
     exports = [
         # do not sort,
@@ -70,7 +70,7 @@ jvm_library(
     ],
     runtime_deps = [
         # do not sort,
-        ":structureView-impl",
+        ":structureView",
         "//platform/editor-ui-api:editor-ui_test_lib",
         "//platform/util:util_test_lib",
         "//platform/extensions:extensions_test_lib",
@@ -102,13 +102,13 @@ jvm_library(
         "//fleet/rhizomedb:rhizomedb_test_lib",
     ],
 )
-### auto-generated section `build intellij.platform.structureView.impl` end
+### auto-generated section `build intellij.platform.structureView` end
 
-### auto-generated section `iml intellij.platform.structureView.impl` start
+### auto-generated section `iml intellij.platform.structureView` start
 exports_files(
     [
-        "intellij.platform.structureView.impl.iml",
+        "intellij.platform.structureView.iml",
     ],
     visibility = ["//visibility:public"],
 )
-### auto-generated section `iml intellij.platform.structureView.impl` end
+### auto-generated section `iml intellij.platform.structureView` end
diff --git a/platform/structure-view-impl/backend/BUILD.bazel b/platform/structure-view-impl/backend/BUILD.bazel
index 10ad3981eea3..f37357fe60a8 100644
--- a/platform/structure-view-impl/backend/BUILD.bazel
+++ b/platform/structure-view-impl/backend/BUILD.bazel
@@ -22,7 +22,7 @@ jvm_library(
     deps = [
         # do not sort,
         "@lib//:kotlin-stdlib",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/platform-impl:ide-impl",
         "//platform/platform-impl/rpc",
         "//platform/kernel/shared:kernel",
@@ -58,7 +58,7 @@ jvm_library(
     runtime_deps = [
         # do not sort,
         ":backend",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/platform-impl:ide-impl_test_lib",
         "//platform/platform-impl/rpc:rpc_test_lib",
         "//platform/kernel/shared:kernel_test_lib",
diff --git a/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml b/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml
index d32bdaaa4cb5..886e04d75cb8 100644
--- a/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml
+++ b/platform/structure-view-impl/backend/intellij.platform.structureView.backend.iml
@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -32,7 +30,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
     <orderEntry type="module" module-name="intellij.platform.kernel" />
diff --git a/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml b/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
index 147e1844f698..e64016007de9 100644
--- a/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
+++ b/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
@@ -17,7 +17,7 @@
     <module name="intellij.platform.rpc.backend"/>
     <module name="intellij.platform.rpc.topics"/>
     <module name="intellij.platform.statistics"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.ui"/>
   </dependencies>
   <!-- endregion -->
diff --git a/platform/structure-view-impl/frontend/BUILD.bazel b/platform/structure-view-impl/frontend/BUILD.bazel
index e91119e95cd0..32aa5ed388d3 100644
--- a/platform/structure-view-impl/frontend/BUILD.bazel
+++ b/platform/structure-view-impl/frontend/BUILD.bazel
@@ -21,7 +21,7 @@ jvm_library(
     deps = [
         # do not sort,
         "@lib//:kotlin-stdlib",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/ide-core",
         "//platform/analysis-api:analysis",
         "//platform/util:util-ui",
@@ -57,7 +57,7 @@ jvm_library(
     runtime_deps = [
         # do not sort,
         ":frontend",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/ide-core:ide-core_test_lib",
         "//platform/analysis-api:analysis_test_lib",
         "//platform/util:util-ui_test_lib",
diff --git a/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml b/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml
index f2e5822e4d88..ccd5d5522cb0 100644
--- a/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml
+++ b/platform/structure-view-impl/frontend/intellij.platform.structureView.frontend.iml
@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -32,7 +30,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
diff --git a/platform/structure-view-impl/frontend/resources/intellij.platform.structureView.frontend.xml b/platform/structure-view-impl/frontend/resources/intellij.platform.structureView.frontend.xml
index 35f7f18f3cca..16ab7688aca2 100644
--- a/platform/structure-view-impl/frontend/resources/intellij.platform.structureView.frontend.xml
+++ b/platform/structure-view-impl/frontend/resources/intellij.platform.structureView.frontend.xml
@@ -16,7 +16,7 @@
     <module name="intellij.platform.rpc.topics"/>
     <module name="intellij.platform.rpc.topics.frontend"/>
     <module name="intellij.platform.statistics"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.coroutines"/>
     <module name="intellij.platform.util.ui"/>
   </dependencies>
diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.iml
similarity index 96%
rename from platform/structure-view-impl/intellij.platform.structureView.impl.iml
rename to platform/structure-view-impl/intellij.platform.structureView.iml
index d93a2c236caf..56f62da1f2c7 100644
--- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml
+++ b/platform/structure-view-impl/intellij.platform.structureView.iml
@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
diff --git a/platform/structure-view-impl/module-content.yaml b/platform/structure-view-impl/module-content.yaml
index e227eaa000c9..94d1b0225453 100644
--- a/platform/structure-view-impl/module-content.yaml
+++ b/platform/structure-view-impl/module-content.yaml
@@ -1,3 +1,3 @@
-- name: dist.all/lib/intellij.platform.structureView.impl.jar
+- name: dist.all/lib/intellij.platform.structureView.jar
   modules:
-  - name: intellij.platform.structureView.impl
\ No newline at end of file
+  - name: intellij.platform.structureView
\ No newline at end of file
diff --git a/platform/structure-view-impl/plugin/plugin-content.yaml b/platform/structure-view-impl/plugin/plugin-content.yaml
index 42a182220560..59cc6a5255a3 100644
--- a/platform/structure-view-impl/plugin/plugin-content.yaml
+++ b/platform/structure-view-impl/plugin/plugin-content.yaml
@@ -4,9 +4,9 @@
 - name: lib/modules/intellij.platform.structureView.frontend.jar
   contentModules:
   - name: intellij.platform.structureView.frontend
-- name: lib/modules/intellij.platform.structureView.impl.jar
+- name: lib/modules/intellij.platform.structureView.jar
   contentModules:
-  - name: intellij.platform.structureView.impl
+  - name: intellij.platform.structureView
 - name: lib/platform-structureView-plugin.jar
   modules:
   - name: intellij.platform.structureView.plugin
diff --git a/platform/structure-view-impl/plugin/resources/META-INF/plugin.xml b/platform/structure-view-impl/plugin/resources/META-INF/plugin.xml
index 29d3ce1528ee..23da1b6fd3b9 100644
--- a/platform/structure-view-impl/plugin/resources/META-INF/plugin.xml
+++ b/platform/structure-view-impl/plugin/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <description>Provides Structure View platform modules for the IDE.</description>
   <vendor>JetBrains</vendor>
   <content namespace="jetbrains">
-    <module name="intellij.platform.structureView.impl" loading="required"/>
+    <module name="intellij.platform.structureView" loading="required"/>
     <module name="intellij.platform.structureView.backend"/>
     <module name="intellij.platform.structureView.frontend"/>
   </content>
diff --git a/platform/structure-view-impl/resources/intellij.platform.structureView.impl.xml b/platform/structure-view-impl/resources/intellij.platform.structureView.xml
similarity index 100%
rename from platform/structure-view-impl/resources/intellij.platform.structureView.impl.xml
rename to platform/structure-view-impl/resources/intellij.platform.structureView.xml
diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel
index 821f73e0c1d4..45b5054c29bb 100644
--- a/platform/testFramework/BUILD.bazel
+++ b/platform/testFramework/BUILD.bazel
@@ -98,7 +98,7 @@ jvm_library(
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
         "//platform/service-container",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/syntax/syntax-api:syntax",
         "//platform/syntax/syntax-psi:psi",
         "//platform/syntax/syntax-util:util",
@@ -229,7 +229,7 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
         "//platform/service-container:service-container_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/syntax/syntax-api:syntax_test_lib",
         "//platform/syntax/syntax-psi:psi_test_lib",
         "//platform/syntax/syntax-util:util_test_lib",
@@ -446,8 +446,8 @@ jvm_library(
         "//platform/refactoring:refactoring_test_lib",
         "//platform/service-container",
         "//platform/service-container:service-container_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/syntax/syntax-api:syntax",
         "//platform/syntax/syntax-api:syntax_test_lib",
         "//platform/syntax/syntax-psi:psi",
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 3621c9934c72..21a2e267749b 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -65,7 +65,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.syntax" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" />
     <orderEntry type="module" module-name="intellij.platform.syntax.util" />
diff --git a/platform/testFramework/intellij.platform.testFramework.tests.iml b/platform/testFramework/intellij.platform.testFramework.tests.iml
index 462ed1925b14..424c4f0786c6 100644
--- a/platform/testFramework/intellij.platform.testFramework.tests.iml
+++ b/platform/testFramework/intellij.platform.testFramework.tests.iml
@@ -61,7 +61,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.serviceContainer" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.syntax.util" scope="TEST" />
diff --git a/platform/testFramework/resources/intellij.platform.testFramework.xml b/platform/testFramework/resources/intellij.platform.testFramework.xml
index 909f254f8613..53bf9489e410 100644
--- a/platform/testFramework/resources/intellij.platform.testFramework.xml
+++ b/platform/testFramework/resources/intellij.platform.testFramework.xml
@@ -27,7 +27,7 @@
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.projectModel.impl"/>
     <module name="intellij.platform.runtime.product"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.testFramework.common"/>
     <module name="intellij.platform.testFramework.core"/>
     <module name="intellij.platform.todo"/>
diff --git a/platform/todo/BUILD.bazel b/platform/todo/BUILD.bazel
index 7b1a241e63e6..bc8c0c2fb444 100644
--- a/platform/todo/BUILD.bazel
+++ b/platform/todo/BUILD.bazel
@@ -38,7 +38,7 @@ jvm_library(
         "//platform/ide-core",
         "//platform/project/shared:project",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/usageView",
         "//platform/indexing-impl",
         "//platform/usageView-impl",
@@ -83,7 +83,7 @@ jvm_library(
         "//platform/ide-core:ide-core_test_lib",
         "//platform/project/shared:project_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView:usageView_test_lib",
         "//platform/indexing-impl:indexing-impl_test_lib",
         "//platform/usageView-impl:usageView-impl_test_lib",
diff --git a/platform/todo/intellij.platform.todo.iml b/platform/todo/intellij.platform.todo.iml
index 957515dc2536..efa211d80fda 100644
--- a/platform/todo/intellij.platform.todo.iml
+++ b/platform/todo/intellij.platform.todo.iml
@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -49,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
diff --git a/platform/todo/resources/intellij.platform.todo.xml b/platform/todo/resources/intellij.platform.todo.xml
index d777cffc16f2..d35f23d9973f 100644
--- a/platform/todo/resources/intellij.platform.todo.xml
+++ b/platform/todo/resources/intellij.platform.todo.xml
@@ -21,7 +21,7 @@
     <module name="intellij.platform.lang.impl"/>
     <module name="intellij.platform.projectModel"/>
     <module name="intellij.platform.projectModel.impl"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.usageView"/>
     <module name="intellij.platform.usageView.impl"/>
     <module name="intellij.platform.util.ui"/>
diff --git a/plugins/commander/BUILD.bazel b/plugins/commander/BUILD.bazel
index e718bb13a6e0..7212cb251f6c 100644
--- a/plugins/commander/BUILD.bazel
+++ b/plugins/commander/BUILD.bazel
@@ -35,7 +35,7 @@ jvm_library(
         "//platform/lang-core",
         "//platform/lvcs-api:lvcs",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util/jdom",
         "//platform/util:util-ui",
         "//platform/core-api:core",
@@ -74,7 +74,7 @@ jvm_library(
         "//platform/lang-core:lang-core_test_lib",
         "//platform/lvcs-api:lvcs_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util/jdom:jdom_test_lib",
         "//platform/util:util-ui_test_lib",
         "//platform/testFramework",
@@ -157,8 +157,8 @@ jvm_library(
         "//platform/lvcs-api:lvcs_test_lib",
         "//platform/projectModel-api:projectModel",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util/jdom",
         "//platform/util/jdom:jdom_test_lib",
         "//platform/testFramework",
diff --git a/plugins/commander/intellij.commander.iml b/plugins/commander/intellij.commander.iml
index 063c11802d14..c637bc29be0f 100644
--- a/plugins/commander/intellij.commander.iml
+++ b/plugins/commander/intellij.commander.iml
@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/commander/intellij.commander.tests.iml b/plugins/commander/intellij.commander.tests.iml
index c2e939e5e1f2..82b43f3fe010 100644
--- a/plugins/commander/intellij.commander.tests.iml
+++ b/plugins/commander/intellij.commander.tests.iml
@@ -21,7 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
diff --git a/plugins/commander/resources/META-INF/plugin.xml b/plugins/commander/resources/META-INF/plugin.xml
index c879bb076254..ea07249a5761 100644
--- a/plugins/commander/resources/META-INF/plugin.xml
+++ b/plugins/commander/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <vendor>JetBrains</vendor>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <resource-bundle>messages.CommanderBundle</resource-bundle>
diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel
index 04d2df4a417e..3e64b0883e77 100644
--- a/plugins/devkit/devkit-core/BUILD.bazel
+++ b/plugins/devkit/devkit-core/BUILD.bazel
@@ -47,7 +47,7 @@ jvm_library(
         "//xml/xml-analysis-api:analysis",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util",
         "//platform/util/jdom",
         "//java/compiler/openapi:java-compiler",
@@ -155,7 +155,7 @@ jvm_library(
         "//xml/xml-analysis-api:analysis_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util:util_test_lib",
         "//platform/util/jdom:jdom_test_lib",
         "//java/compiler/openapi:java-compiler_test_lib",
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index 576186b307d2..2ed113f5af05 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -45,7 +44,7 @@
     <orderEntry type="module" module-name="intellij.xml.analysis" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.java.compiler" />
diff --git a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
index 86a8e73222c5..b10c825e5061 100644
--- a/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+++ b/plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
@@ -9,7 +9,7 @@
     <module name="intellij.java.xml.dom.impl"/>
     <module name="intellij.json.backend"/>
     <module name="intellij.libraries.xerces"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.testRunner"/>
     <module name="intellij.properties.backend"/>
     <module name="intellij.properties.backend.psi"/>
diff --git a/plugins/devkit/devkit-java-tests/BUILD.bazel b/plugins/devkit/devkit-java-tests/BUILD.bazel
index 787fae5e58bf..f00796cc3651 100644
--- a/plugins/devkit/devkit-java-tests/BUILD.bazel
+++ b/plugins/devkit/devkit-java-tests/BUILD.bazel
@@ -82,8 +82,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//xml/xml-psi-api:psi",
         "//xml/xml-psi-api:psi_test_lib",
         "//xml/xml-psi-impl:psi-impl",
diff --git a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
index 2cb858b2925c..42fbef7a083b 100644
--- a/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
+++ b/plugins/devkit/devkit-java-tests/intellij.devkit.java.tests.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.analysis" scope="TEST" />
diff --git a/plugins/editorconfig/backend/BUILD.bazel b/plugins/editorconfig/backend/BUILD.bazel
index 2cbe7b5e48ec..a1614d51089c 100644
--- a/plugins/editorconfig/backend/BUILD.bazel
+++ b/plugins/editorconfig/backend/BUILD.bazel
@@ -99,8 +99,8 @@ jvm_library(
         "//platform/ide-core:ide-core_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//libraries/kotlin/reflect:reflect_test_lib",
@@ -203,8 +203,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//libraries/kotlin/reflect",
diff --git a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml
index 1fe632dbd927..ce01a8ab7cbd 100644
--- a/plugins/editorconfig/backend/intellij.editorconfig.backend.iml
+++ b/plugins/editorconfig/backend/intellij.editorconfig.backend.iml
@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -50,7 +49,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
diff --git a/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml b/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml
index 0c07bae47bf3..ae70b8f82ce2 100644
--- a/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml
+++ b/plugins/editorconfig/backend/intellij.editorconfig.backend.tests.iml
@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -47,7 +46,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.gson" scope="TEST" />
diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel
index 6b0199ef1905..006859b44bd2 100644
--- a/plugins/gradle/java/BUILD.bazel
+++ b/plugins/gradle/java/BUILD.bazel
@@ -246,8 +246,8 @@ jvm_library(
         "//platform/lang-core:lang-core_test_lib",
         "//platform/projectModel-api:projectModel",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//java/testFramework",
diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
index 4ae4c75afaf7..cafe90c5f0c9 100644
--- a/plugins/gradle/java/intellij.gradle.java.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel
index 399eb7c5b0cc..b0671fa653aa 100644
--- a/plugins/groovy/BUILD.bazel
+++ b/plugins/groovy/BUILD.bazel
@@ -35,7 +35,7 @@ jvm_library(
         "//platform/macro",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/workspace/storage",
         "//xml/dom-openapi:dom",
         "//java/openapi:java",
@@ -127,7 +127,7 @@ jvm_library(
         "//platform/macro:macro_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/workspace/storage:storage_test_lib",
         "//xml/dom-openapi:dom_test_lib",
         "//java/openapi:java_test_lib",
@@ -289,8 +289,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/workspace/storage",
         "//platform/workspace/storage:storage_test_lib",
         "//xml/dom-openapi:dom",
diff --git a/plugins/groovy/groovy-psi/BUILD.bazel b/plugins/groovy/groovy-psi/BUILD.bazel
index bf709cb4bc5f..b7227e05a47d 100644
--- a/plugins/groovy/groovy-psi/BUILD.bazel
+++ b/plugins/groovy/groovy-psi/BUILD.bazel
@@ -42,7 +42,7 @@ jvm_library(
         "//platform/indexing-api:indexing",
         "//jps/model-api:model",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//xml/xml-psi-api:psi",
         "//xml/xml-psi-impl:psi-impl",
         "//platform/editor-ui-ex:editor-ex",
@@ -103,7 +103,7 @@ jvm_library(
         "//platform/indexing-api:indexing_test_lib",
         "//jps/model-api:model_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//xml/xml-psi-api:psi_test_lib",
         "//xml/xml-psi-impl:psi-impl_test_lib",
         "//platform/editor-ui-ex:editor-ex_test_lib",
diff --git a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
index a1e008d5c024..f093ef45d867 100644
--- a/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
+++ b/plugins/groovy/groovy-psi/intellij.groovy.psi.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml
index c716933649f9..02e55e5d8da4 100644
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.macro" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.xml.dom" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/groovy/intellij.groovy.tests.iml b/plugins/groovy/intellij.groovy.tests.iml
index 8da816e30cb4..a28d64237230 100644
--- a/plugins/groovy/intellij.groovy.tests.iml
+++ b/plugins/groovy/intellij.groovy.tests.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.macro" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.dom" scope="TEST" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/groovy/resources/META-INF/plugin.xml b/plugins/groovy/resources/META-INF/plugin.xml
index 9c9612b264c6..ab6d0daa81ec 100644
--- a/plugins/groovy/resources/META-INF/plugin.xml
+++ b/plugins/groovy/resources/META-INF/plugin.xml
@@ -37,7 +37,7 @@
     <module name="intellij.java.unscramble"/>
     <module name="intellij.platform.jps.build.javac.rt"/>
     <module name="intellij.platform.smRunner"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.testRunner"/>
     <module name="intellij.properties.backend"/>
     <module name="intellij.properties.psi"/>
diff --git a/plugins/java-decompiler/plugin/BUILD.bazel b/plugins/java-decompiler/plugin/BUILD.bazel
index 43125b602d98..3072975df936 100644
--- a/plugins/java-decompiler/plugin/BUILD.bazel
+++ b/plugins/java-decompiler/plugin/BUILD.bazel
@@ -86,8 +86,8 @@ jvm_library(
         "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib",
         "//platform/lang-impl:lang-impl_test_lib",
         "//platform/statistics:statistics_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
     ],
 )
 ### auto-generated section `build intellij.java.decompiler` end
@@ -183,8 +183,8 @@ jvm_library(
         "//platform/lang-impl:lang-impl_test_lib",
         "//platform/statistics",
         "//platform/statistics:statistics_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//java/java-frontback-psi-api:frontback-psi",
         "//java/java-frontback-psi-api:frontback-psi_test_lib",
     ],
diff --git a/plugins/java-decompiler/plugin/intellij.java.decompiler.iml b/plugins/java-decompiler/plugin/intellij.java.decompiler.iml
index f315291ad44d..2b6312ef317d 100644
--- a/plugins/java-decompiler/plugin/intellij.java.decompiler.iml
+++ b/plugins/java-decompiler/plugin/intellij.java.decompiler.iml
@@ -30,6 +30,6 @@
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml b/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml
index e3204ea1e228..fb36d21b4ba3 100644
--- a/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml
+++ b/plugins/java-decompiler/plugin/intellij.java.decompiler.tests.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.decompiler" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.frontback.psi" scope="TEST" />
   </component>
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel
index 4413b513d34c..2e4fd82cf5fa 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel
@@ -51,7 +51,7 @@ jvm_library(
         "//platform/indexing-api:indexing",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/usageView-impl",
         "//plugins/kotlin/base/util",
         "//plugins/kotlin/base/psi",
@@ -129,7 +129,7 @@ jvm_library(
         "//platform/indexing-api:indexing_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//plugins/kotlin/base/util:util_test_lib",
         "//plugins/kotlin/base/psi:psi_test_lib",
@@ -267,8 +267,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//plugins/kotlin/plugin/k2",
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml
index 46e5e53635c6..d8eab7606ef4 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.iml
@@ -36,7 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.kotlin.base.util" />
     <orderEntry type="module" module-name="intellij.kotlin.base.psi" />
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml
index bd3f9c91837b..04920be3cd2c 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/intellij.kotlin.codeInsight.tests.iml
@@ -37,7 +37,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.plugin.k2" scope="TEST" />
     <orderEntry type="module" module-name="intellij.kotlin.base.util" scope="TEST" />
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/intellij.kotlin.codeInsight.xml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/intellij.kotlin.codeInsight.xml
index 3278596eb89a..15c7112a3b8f 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/intellij.kotlin.codeInsight.xml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/resources/intellij.kotlin.codeInsight.xml
@@ -7,7 +7,7 @@
     <module name="intellij.kotlin.codeInsight.shared"/>
     <module name="intellij.kotlin.refactorings"/>
     <module name="intellij.kotlin.searching"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
 
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index b637c1f3e456..af42e07c6ce4 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -45,7 +45,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
diff --git a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel
index a0b859adae6c..1b2cb5c3240e 100644
--- a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel
+++ b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel
@@ -151,8 +151,8 @@ jvm_library(
         "//java/java-syntax:syntax",
         "//java/java-syntax:syntax_test_lib",
         "@lib//:jet_check",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared",
         "//plugins/kotlin/code-insight/impl-base:kotlin-codeInsight-shared_test_lib",
         "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common",
diff --git a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml
index b2a1d64372c4..faa4ffbdb4e7 100644
--- a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml
+++ b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml
@@ -70,7 +70,7 @@
     <orderEntry type="module" module-name="intellij.java.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jetCheck" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.kotlin.codeInsight.shared" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.refactorings.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" scope="TEST" />
diff --git a/plugins/kotlin/kotlin.ide/BUILD.bazel b/plugins/kotlin/kotlin.ide/BUILD.bazel
index c5a0d1fa57c2..c8cd8bfdb7b9 100644
--- a/plugins/kotlin/kotlin.ide/BUILD.bazel
+++ b/plugins/kotlin/kotlin.ide/BUILD.bazel
@@ -54,7 +54,7 @@ jvm_library(
         "@lib//:kotlinc-kotlin-scripting-compiler-impl",
         "//plugins/kotlin/base/scripting/scripting.shared",
         "//libraries/gson",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/statistics",
     ],
 )
@@ -106,7 +106,7 @@ jvm_library(
         "//platform/diff-impl:diff-impl_test_lib",
         "//plugins/kotlin/base/scripting/scripting.shared:scripting.shared_test_lib",
         "//libraries/gson:gson_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/statistics:statistics_test_lib",
     ],
 )
diff --git a/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml b/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml
index c8cd939e5fcc..eeb86d3cbf85 100644
--- a/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml
+++ b/plugins/kotlin/kotlin.ide/intellij.kotlin.ide.iml
@@ -45,7 +45,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="module" module-name="intellij.kotlin.base.scripting.shared" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/lombok/BUILD.bazel b/plugins/lombok/BUILD.bazel
index fd321560464b..7cc07c54cd22 100644
--- a/plugins/lombok/BUILD.bazel
+++ b/plugins/lombok/BUILD.bazel
@@ -46,7 +46,7 @@ jvm_library(
         "//libraries/guava",
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//java/java-impl-inspections:impl-inspections",
         "//java/java-impl-refactorings:impl-refactorings",
         "//java/codeserver/highlighting",
@@ -94,7 +94,7 @@ jvm_library(
         "//libraries/guava:guava_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//java/testFramework",
@@ -239,8 +239,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//java/testFramework",
diff --git a/plugins/lombok/intellij.lombok.iml b/plugins/lombok/intellij.lombok.iml
index 7f593b999623..55d8d5b94bcc 100644
--- a/plugins/lombok/intellij.lombok.iml
+++ b/plugins/lombok/intellij.lombok.iml
@@ -32,7 +32,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/plugins/lombok/intellij.lombok.tests.iml b/plugins/lombok/intellij.lombok.tests.iml
index 537cd0287d37..62c4ef7c50d3 100644
--- a/plugins/lombok/intellij.lombok.tests.iml
+++ b/plugins/lombok/intellij.lombok.tests.iml
@@ -39,7 +39,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/plugins/lombok/src/main/resources/META-INF/plugin.xml b/plugins/lombok/src/main/resources/META-INF/plugin.xml
index 0b0aa35cc08e..b5d9173e8bc2 100644
--- a/plugins/lombok/src/main/resources/META-INF/plugin.xml
+++ b/plugins/lombok/src/main/resources/META-INF/plugin.xml
@@ -48,7 +48,7 @@
     <module name="intellij.java.frontback.psi"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <depends>com.intellij.modules.lang</depends>
diff --git a/plugins/markdown/core/BUILD.bazel b/plugins/markdown/core/BUILD.bazel
index f4332fa01b18..60f478201e1b 100644
--- a/plugins/markdown/core/BUILD.bazel
+++ b/plugins/markdown/core/BUILD.bazel
@@ -62,7 +62,7 @@ jvm_library(
         "//libraries/miglayout-swing",
         "//platform/platform-api:ide",
         "//platform/statistics",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/util/jdom",
         "//libraries/kotlinx/coroutines/core",
         "//platform/diagnostic",
@@ -139,7 +139,7 @@ jvm_library(
         "//libraries/miglayout-swing:miglayout-swing_test_lib",
         "//platform/platform-api:ide_test_lib",
         "//platform/statistics:statistics_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/util/jdom:jdom_test_lib",
         "//libraries/kotlinx/coroutines/core:core_test_lib",
         "//platform/diagnostic:diagnostic_test_lib",
diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml
index 84ca49002409..d9b16f02367a 100644
--- a/plugins/markdown/core/intellij.markdown.iml
+++ b/plugins/markdown/core/intellij.markdown.iml
@@ -14,9 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -71,7 +69,7 @@
     <orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
diff --git a/plugins/markdown/core/resources/META-INF/plugin.xml b/plugins/markdown/core/resources/META-INF/plugin.xml
index bede22ee33bd..49b34ee1ddcd 100644
--- a/plugins/markdown/core/resources/META-INF/plugin.xml
+++ b/plugins/markdown/core/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.lang"/>
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <!-- endregion -->
   </dependencies>
 
diff --git a/plugins/markdown/core/resources/intellij.markdown.xml b/plugins/markdown/core/resources/intellij.markdown.xml
index 2c55b92a70d2..867bc1ae9dc7 100644
--- a/plugins/markdown/core/resources/intellij.markdown.xml
+++ b/plugins/markdown/core/resources/intellij.markdown.xml
@@ -1,7 +1,7 @@
 <idea-plugin visibility="public">
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <extensions defaultExtensionNs="org.intellij.markdown">
diff --git a/plugins/markdown/test/BUILD.bazel b/plugins/markdown/test/BUILD.bazel
index 6af6ae8aa4e2..81a0561a439c 100644
--- a/plugins/markdown/test/BUILD.bazel
+++ b/plugins/markdown/test/BUILD.bazel
@@ -182,8 +182,8 @@ jvm_library(
         "//RegExpSupport:regexp-tests_test_lib",
         "//platform/xdebugger-impl:debugger-impl-tests",
         "//platform/xdebugger-impl:debugger-impl-tests_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
         "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
         "//platform/lang-core",
diff --git a/plugins/markdown/test/intellij.markdown.tests.iml b/plugins/markdown/test/intellij.markdown.tests.iml
index 543e9cd3493b..116bf139c1c1 100644
--- a/plugins/markdown/test/intellij.markdown.tests.iml
+++ b/plugins/markdown/test/intellij.markdown.tests.iml
@@ -63,7 +63,7 @@
     <orderEntry type="module" module-name="intellij.platform.images.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.regexp.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.plugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel
index 90d47364b7f0..dccc2f19462b 100644
--- a/plugins/maven/src/test/BUILD.bazel
+++ b/plugins/maven/src/test/BUILD.bazel
@@ -76,8 +76,8 @@ jvm_library(
         "//java/java-syntax:syntax_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//java/testFramework",
diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml
index 9e329349746a..1e961397977a 100644
--- a/plugins/maven/src/test/intellij.maven.tests.iml
+++ b/plugins/maven/src/test/intellij.maven.tests.iml
@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.syntax" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.psi" scope="TEST" />
diff --git a/plugins/performanceTesting/core/BUILD.bazel b/plugins/performanceTesting/core/BUILD.bazel
index 75b88bfe4c31..2da6a6aa153e 100644
--- a/plugins/performanceTesting/core/BUILD.bazel
+++ b/plugins/performanceTesting/core/BUILD.bazel
@@ -74,7 +74,7 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt",
     "//platform/xdebugger-impl/shared",
     "//platform/xdebugger-impl/ui",
-    "//platform/structure-view-impl:structureView-impl",
+    "//platform/structure-view-impl:structureView",
     ":libraries_cli-parser_provided",
   ]
 )
@@ -146,7 +146,7 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt_test_lib",
     "//platform/xdebugger-impl/shared:shared_test_lib",
     "//platform/xdebugger-impl/ui:ui_test_lib",
-    "//platform/structure-view-impl:structureView-impl_test_lib",
+    "//platform/structure-view-impl:structureView_test_lib",
   ]
 )
 
@@ -309,8 +309,8 @@ jvm_library(
         "//platform/xdebugger-impl/shared:shared_test_lib",
         "//platform/xdebugger-impl/ui",
         "//platform/xdebugger-impl/ui:ui_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework/teamCity",
         "//platform/testFramework/teamCity:teamCity_test_lib",
         "//plugins/performanceTesting/freezes",
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml
index 81cb7765bd81..a777c2dce00a 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml
@@ -69,6 +69,6 @@
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.ui" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.tests.iml b/plugins/performanceTesting/core/intellij.performanceTesting.tests.iml
index bacd8caa1ec2..6566f2634966 100644
--- a/plugins/performanceTesting/core/intellij.performanceTesting.tests.iml
+++ b/plugins/performanceTesting/core/intellij.performanceTesting.tests.iml
@@ -67,7 +67,7 @@
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.shared" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl.ui" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.teamCity" scope="TEST" />
     <orderEntry type="module" module-name="intellij.performanceTesting" scope="TEST" />
     <orderEntry type="module" module-name="intellij.performanceTesting.freezes" scope="TEST" />
diff --git a/plugins/performanceTesting/core/resources/META-INF/plugin.xml b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
index a8e08f029c33..ffb904c0e9ee 100644
--- a/plugins/performanceTesting/core/resources/META-INF/plugin.xml
+++ b/plugins/performanceTesting/core/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
 
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <content namespace="jetbrains">
diff --git a/plugins/performanceTesting/frontend/BUILD.bazel b/plugins/performanceTesting/frontend/BUILD.bazel
index 741a5cda2e30..425ecefe68b9 100644
--- a/plugins/performanceTesting/frontend/BUILD.bazel
+++ b/plugins/performanceTesting/frontend/BUILD.bazel
@@ -34,7 +34,7 @@ jvm_library(
         "//libraries/opentelemetry-semconv",
         "//platform/diagnostic/telemetry",
         "//platform/lang-impl",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/structure-view-impl/frontend",
         "//platform/util/coroutines",
         "//platform/util:util-ui",
@@ -67,7 +67,7 @@ jvm_library(
         "//libraries/opentelemetry-semconv:opentelemetry-semconv_test_lib",
         "//platform/diagnostic/telemetry:telemetry_test_lib",
         "//platform/lang-impl:lang-impl_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/structure-view-impl/frontend:frontend_test_lib",
         "//platform/util/coroutines:coroutines_test_lib",
         "//platform/util:util-ui_test_lib",
diff --git a/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml b/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml
index 4dd590c5edbe..91971ffde483 100644
--- a/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml
+++ b/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.libraries.opentelemetry.semconv" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.structureView.frontend" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
diff --git a/plugins/performanceTesting/frontend/resources/intellij.performanceTesting.frontend.xml b/plugins/performanceTesting/frontend/resources/intellij.performanceTesting.frontend.xml
index 455a99eb5702..4e2acb800936 100644
--- a/plugins/performanceTesting/frontend/resources/intellij.performanceTesting.frontend.xml
+++ b/plugins/performanceTesting/frontend/resources/intellij.performanceTesting.frontend.xml
@@ -4,7 +4,7 @@
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <module name="intellij.platform.recentFiles.frontend"/>
     <module name="intellij.platform.structureView.frontend"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <!-- endregion -->
   </dependencies>
 
diff --git a/plugins/properties/BUILD.bazel b/plugins/properties/BUILD.bazel
index 4ba45db88d77..17ecb3390183 100644
--- a/plugins/properties/BUILD.bazel
+++ b/plugins/properties/BUILD.bazel
@@ -50,7 +50,7 @@ jvm_library(
         "//plugins/properties/properties-common:properties",
         "//platform/diff-impl",
         "//platform/forms_rt:java-guiForms-rt",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//libraries/fastutil",
         "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable",
         "//platform/util/concurrency",
@@ -100,7 +100,7 @@ jvm_library(
         "//platform/backend:backend_test_lib",
         "//platform/diff-impl:diff-impl_test_lib",
         "//platform/forms_rt:java-guiForms-rt_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//libraries/fastutil:fastutil_test_lib",
         "//libraries/kotlinx/collections-immutable:libraries-kotlinx-collections-immutable_test_lib",
         "//platform/util/concurrency:concurrency_test_lib",
diff --git a/plugins/properties/intellij.properties.backend.iml b/plugins/properties/intellij.properties.backend.iml
index 52a8bcce23e7..0f0613ecb613 100644
--- a/plugins/properties/intellij.properties.backend.iml
+++ b/plugins/properties/intellij.properties.backend.iml
@@ -38,7 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.collections.immutable" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
diff --git a/plugins/properties/properties-psi-impl/BUILD.bazel b/plugins/properties/properties-psi-impl/BUILD.bazel
index 693f98b692bf..007047f51e83 100644
--- a/plugins/properties/properties-psi-impl/BUILD.bazel
+++ b/plugins/properties/properties-psi-impl/BUILD.bazel
@@ -35,7 +35,7 @@ jvm_library(
         "//platform/editor-ui-api:editor-ui",
         "//platform/analysis-api:analysis",
         "//xml/xml-psi-api:psi",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/refactoring",
         "//platform/platform-impl:ide-impl",
         "//platform/indexing-impl",
@@ -85,7 +85,7 @@ jvm_library(
         "//platform/editor-ui-api:editor-ui_test_lib",
         "//platform/analysis-api:analysis_test_lib",
         "//xml/xml-psi-api:psi_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/refactoring:refactoring_test_lib",
         "//platform/platform-impl:ide-impl_test_lib",
         "//platform/indexing-impl:indexing-impl_test_lib",
diff --git a/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml b/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml
index 62898ea86c82..f522f9dac56d 100644
--- a/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml
+++ b/plugins/properties/properties-psi-impl/intellij.properties.backend.psi.iml
@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
diff --git a/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml b/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
index 41a4df8daba0..60f6af76c1c0 100644
--- a/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
+++ b/plugins/properties/properties-psi-impl/resources/intellij.properties.backend.psi.xml
@@ -4,7 +4,7 @@
     <plugin id="com.intellij.modules.xml"/>
     <module name="intellij.properties"/>
     <module name="intellij.platform.backend"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/properties/resources/intellij.properties.backend.xml b/plugins/properties/resources/intellij.properties.backend.xml
index 164002a7c6b6..83d748d7fbf1 100644
--- a/plugins/properties/resources/intellij.properties.backend.xml
+++ b/plugins/properties/resources/intellij.properties.backend.xml
@@ -7,7 +7,7 @@
     <module name="intellij.properties.psi"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.structuralSearch"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.properties.backend.psi"/>
     <module name="intellij.spellchecker"/>
   </dependencies>
diff --git a/plugins/properties/tests/BUILD.bazel b/plugins/properties/tests/BUILD.bazel
index 70945fd6f91d..26af6e52ccbf 100644
--- a/plugins/properties/tests/BUILD.bazel
+++ b/plugins/properties/tests/BUILD.bazel
@@ -68,8 +68,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//platform/util/diff",
diff --git a/plugins/properties/tests/intellij.properties.tests.iml b/plugins/properties/tests/intellij.properties.tests.iml
index bf16032f8e42..2caa2bbf4c9e 100644
--- a/plugins/properties/tests/intellij.properties.tests.iml
+++ b/plugins/properties/tests/intellij.properties.tests.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
diff --git a/plugins/restructuredtext/BUILD.bazel b/plugins/restructuredtext/BUILD.bazel
index 591d0a78bc40..78909f7d879d 100644
--- a/plugins/restructuredtext/BUILD.bazel
+++ b/plugins/restructuredtext/BUILD.bazel
@@ -48,7 +48,7 @@ jvm_library(
         "//platform/editor-ui-api:editor-ui",
         "//libraries/guava",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/editor-ui-ex:editor-ex",
         "//platform/platform-impl:ide-impl",
         "//platform/util:util-ui",
@@ -90,7 +90,7 @@ jvm_library(
         "//platform/execution-impl:execution-impl_test_lib",
         "//libraries/guava:guava_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//platform/editor-ui-ex:editor-ex_test_lib",
@@ -166,8 +166,8 @@ jvm_library(
         "//libraries/guava:guava_test_lib",
         "//platform/projectModel-api:projectModel",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//platform/editor-ui-ex:editor-ex",
diff --git a/plugins/restructuredtext/intellij.restructuredtext.iml b/plugins/restructuredtext/intellij.restructuredtext.iml
index dd687b9f1b7c..a0f5eeea17a8 100644
--- a/plugins/restructuredtext/intellij.restructuredtext.iml
+++ b/plugins/restructuredtext/intellij.restructuredtext.iml
@@ -17,7 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="PROVIDED" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/plugins/restructuredtext/intellij.restructuredtext.tests.iml b/plugins/restructuredtext/intellij.restructuredtext.tests.iml
index 8986f78bab08..76093cc151df 100644
--- a/plugins/restructuredtext/intellij.restructuredtext.tests.iml
+++ b/plugins/restructuredtext/intellij.restructuredtext.tests.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="PROVIDED" />
     <orderEntry type="module" module-name="intellij.libraries.guava" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
diff --git a/plugins/restructuredtext/resources/META-INF/plugin.xml b/plugins/restructuredtext/resources/META-INF/plugin.xml
index de9e7449d53b..c15db766ae11 100644
--- a/plugins/restructuredtext/resources/META-INF/plugin.xml
+++ b/plugins/restructuredtext/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="com.intellij.modules.spellchecker"/>
     <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <!-- endregion -->
   </dependencies>
 
diff --git a/plugins/ui-designer/BUILD.bazel b/plugins/ui-designer/BUILD.bazel
index 3393fc3a2b17..d66257d5f1e0 100644
--- a/plugins/ui-designer/BUILD.bazel
+++ b/plugins/ui-designer/BUILD.bazel
@@ -119,8 +119,8 @@ jvm_library(
         "//platform/lang-core:lang-core_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//platform/platform-impl:ide-impl_test_lib",
@@ -284,8 +284,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/structure-view-impl/plugin",
         "//platform/structure-view-impl/plugin:plugin_test_lib",
         "//platform/todo/plugin",
diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.iml b/plugins/ui-designer/intellij.java.guiForms.designer.iml
index 6a5e517fff82..16ca56fd22da 100644
--- a/plugins/ui-designer/intellij.java.guiForms.designer.iml
+++ b/plugins/ui-designer/intellij.java.guiForms.designer.iml
@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
diff --git a/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml b/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml
index f376aec860c4..6beb80d7ddc4 100644
--- a/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml
+++ b/plugins/ui-designer/intellij.java.guiForms.designer.tests.iml
@@ -29,7 +29,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.todo.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/xpath/BUILD.bazel b/plugins/xpath/BUILD.bazel
index 06c755d1f29c..21057d9adace 100644
--- a/plugins/xpath/BUILD.bazel
+++ b/plugins/xpath/BUILD.bazel
@@ -36,7 +36,7 @@ jvm_library(
         "//jps/model-api:model",
         "//platform/lang-core",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/platform-impl/concurrency",
         "//platform/lang-api:lang",
         "//platform/platform-impl:ide-impl",
@@ -89,7 +89,7 @@ jvm_library(
         "//jps/model-api:model_test_lib",
         "//platform/lang-core:lang-core_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/platform-impl/concurrency:concurrency_test_lib",
         "//platform/lang-api:lang_test_lib",
         "//platform/platform-impl:ide-impl_test_lib",
@@ -198,8 +198,8 @@ jvm_library(
         "//platform/lang-core:lang-core_test_lib",
         "//platform/projectModel-api:projectModel",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/platform-impl/concurrency",
         "//platform/lang-api:lang",
         "//platform/lang-api:lang_test_lib",
diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml
index 2ef797253c64..8dd326ef1580 100644
--- a/plugins/xpath/intellij.xpath.iml
+++ b/plugins/xpath/intellij.xpath.iml
@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/plugins/xpath/intellij.xpath.tests.iml b/plugins/xpath/intellij.xpath.tests.iml
index 270322cc99f6..004483e5dae2 100644
--- a/plugins/xpath/intellij.xpath.tests.iml
+++ b/plugins/xpath/intellij.xpath.tests.iml
@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
diff --git a/plugins/xpath/xpath-lang/resources/META-INF/plugin.xml b/plugins/xpath/xpath-lang/resources/META-INF/plugin.xml
index 3be7eb53ad25..ec0e7a509b90 100644
--- a/plugins/xpath/xpath-lang/resources/META-INF/plugin.xml
+++ b/plugins/xpath/xpath-lang/resources/META-INF/plugin.xml
@@ -13,7 +13,7 @@
 
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
   </dependencies>
   <!-- endregion -->
   <depends>com.intellij.modules.xml</depends>
diff --git a/plugins/yaml/backend/BUILD.bazel b/plugins/yaml/backend/BUILD.bazel
index 42d6d2058c24..4cfb5e47a9a7 100644
--- a/plugins/yaml/backend/BUILD.bazel
+++ b/plugins/yaml/backend/BUILD.bazel
@@ -32,7 +32,7 @@ jvm_library(
         "//platform/lang-impl",
         "//platform/core-impl",
         "//platform/projectModel-api:projectModel",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//spellchecker",
         "//platform/platform-impl:ide-impl",
         "//json/backend",
@@ -81,7 +81,7 @@ jvm_library(
         "//platform/lang-impl:lang-impl_test_lib",
         "//platform/core-impl:core-impl_test_lib",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//spellchecker:spellchecker_test_lib",
@@ -195,8 +195,8 @@ jvm_library(
         "//platform/core-impl:core-impl_test_lib",
         "//platform/projectModel-api:projectModel",
         "//platform/projectModel-api:projectModel_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/testFramework",
         "//platform/testFramework:testFramework_test_lib",
         "//spellchecker",
diff --git a/plugins/yaml/backend/intellij.yaml.backend.iml b/plugins/yaml/backend/intellij.yaml.backend.iml
index 26708f6630fb..522c9e4332d0 100644
--- a/plugins/yaml/backend/intellij.yaml.backend.iml
+++ b/plugins/yaml/backend/intellij.yaml.backend.iml
@@ -20,7 +20,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="module" module-name="intellij.grazie.core" scope="TEST" />
diff --git a/plugins/yaml/backend/intellij.yaml.backend.tests.iml b/plugins/yaml/backend/intellij.yaml.backend.tests.iml
index 5e4e24837ed8..b4be2cd77335 100644
--- a/plugins/yaml/backend/intellij.yaml.backend.tests.iml
+++ b/plugins/yaml/backend/intellij.yaml.backend.tests.iml
@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="intellij.grazie.core" scope="TEST" />
diff --git a/plugins/yaml/backend/resources/intellij.yaml.backend.xml b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
index c9a70524b2bb..ff5226ea4c48 100644
--- a/plugins/yaml/backend/resources/intellij.yaml.backend.xml
+++ b/plugins/yaml/backend/resources/intellij.yaml.backend.xml
@@ -5,7 +5,7 @@
     <module name="intellij.json.backend"/>
     <module name="intellij.platform.backend"/>
     <module name="intellij.platform.searchEverywhere.backend"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.spellchecker"/>
   </dependencies>
   <!-- endregion -->
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index a82305bca3cb..cd69337a1dcb 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -402,7 +402,7 @@ jvm_library(
         "//platform/projectModel-api:projectModel",
         "//platform/refactoring",
         "//platform/remote-core",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/usageView-impl",
         "//platform/workspace/storage",
         "//python/openapi:community",
@@ -564,7 +564,7 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring:refactoring_test_lib",
         "//platform/remote-core:remote-core_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//platform/workspace/storage:storage_test_lib",
         "//python/openapi:community_test_lib",
@@ -769,8 +769,8 @@ jvm_library(
         "//platform/refactoring:refactoring_test_lib",
         "//platform/remote-core",
         "//platform/remote-core:remote-core_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/usageView-impl",
         "//platform/usageView-impl:usageView-impl_test_lib",
         "//platform/workspace/storage",
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index 1ffa4784e807..25ea2da950f9 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -50,7 +50,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.remote.core" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.python.community" exported="" />
diff --git a/python/intellij.python.community.impl.tests.iml b/python/intellij.python.community.impl.tests.iml
index 065483dbdb7e..e6c26b4420f4 100644
--- a/python/intellij.python.community.impl.tests.iml
+++ b/python/intellij.python.community.impl.tests.iml
@@ -16,7 +16,6 @@
             <arrayArg name="pluginClasspaths">
               <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
-            <arrayArg name="pluginOptions" />
           </arrayArguments>
         </compilerArguments>
       </configuration>
@@ -45,7 +44,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.remote.core" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.usageView.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community" exported="" scope="TEST" />
diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index d345c95b0112..672cfc9f4091 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -8,7 +8,7 @@
     <module name="intellij.json"/>
     <module name="intellij.libraries.xstream"/>
     <module name="intellij.platform.smRunner"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.testRunner"/>
     <module name="intellij.python.common"/>
     <module name="intellij.python.community"/>
diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel
index 3b4b2c2f8add..29806b43df43 100644
--- a/xml/tests/BUILD.bazel
+++ b/xml/tests/BUILD.bazel
@@ -72,8 +72,8 @@ jvm_library(
         "//platform/projectModel-api:projectModel_test_lib",
         "//platform/refactoring",
         "//platform/refactoring:refactoring_test_lib",
-        "//platform/structure-view-impl:structureView-impl",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/structure-view-impl/frontend",
         "//platform/structure-view-impl/frontend:frontend_test_lib",
         "//platform/structure-view-impl/backend",
diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml
index 365d5a887a6e..6393efdaeb30 100644
--- a/xml/tests/intellij.xml.tests.iml
+++ b/xml/tests/intellij.xml.tests.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.frontend" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.structureView.backend" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
diff --git a/xml/xml-structure-view-impl/BUILD.bazel b/xml/xml-structure-view-impl/BUILD.bazel
index e1bffdf4be3a..249063c41d50 100644
--- a/xml/xml-structure-view-impl/BUILD.bazel
+++ b/xml/xml-structure-view-impl/BUILD.bazel
@@ -28,7 +28,7 @@ jvm_library(
         "//xml/xml-psi-api:psi",
         "//xml/xml-structure-view-api:structureView",
         "//xml/xml-psi-impl:psi-impl",
-        "//platform/structure-view-impl:structureView-impl",
+        "//platform/structure-view-impl:structureView",
         "//platform/core-impl",
         "//platform/util:util-ui",
         "//xml/xml-parser:parser",
@@ -56,7 +56,7 @@ jvm_library(
         "//xml/xml-psi-api:psi_test_lib",
         "//xml/xml-structure-view-api:structureView_test_lib",
         "//xml/xml-psi-impl:psi-impl_test_lib",
-        "//platform/structure-view-impl:structureView-impl_test_lib",
+        "//platform/structure-view-impl:structureView_test_lib",
         "//platform/core-impl:core-impl_test_lib",
         "//platform/util:util-ui_test_lib",
         "//xml/xml-parser:parser_test_lib",
diff --git a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
index be4864c7c57f..a3c23d4b12ff 100644
--- a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
+++ b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.xml.psi" />
     <orderEntry type="module" module-name="intellij.xml.structureView" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
-    <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.xml.parser" />
diff --git a/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
index aa05a4c57207..89219b9c91f5 100644
--- a/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
+++ b/xml/xml-structure-view-impl/resources/intellij.xml.structureView.impl.xml
@@ -6,7 +6,7 @@
     <module name="intellij.platform.core.impl"/>
     <module name="intellij.platform.editor.ui"/>
     <module name="intellij.platform.lang.impl"/>
-    <module name="intellij.platform.structureView.impl"/>
+    <module name="intellij.platform.structureView"/>
     <module name="intellij.platform.util.ui"/>
     <module name="intellij.xml.dom"/>
     <module name="intellij.xml.dom.impl"/>