diff --git a/.idea/modules.xml b/.idea/modules.xml
index 2d45adfcbd9d..39914d0aef22 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1264,8 +1264,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml" filepath="$PROJECT_DIR$/platform/pluginManager/backend/intellij.platform.pluginManager.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/pluginManager/frontend/intellij.platform.pluginManager.frontend.iml" filepath="$PROJECT_DIR$/platform/pluginManager/frontend/intellij.platform.pluginManager.frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/pluginManager/shared/intellij.platform.pluginManager.shared.iml" filepath="$PROJECT_DIR$/platform/pluginManager/shared/intellij.platform.pluginManager.shared.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml" filepath="$PROJECT_DIR$/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/plugins/testFramework/intellij.platform.plugins.testFramework.iml" filepath="$PROJECT_DIR$/platform/plugins/testFramework/intellij.platform.plugins.testFramework.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/pluginSystem/parser/impl/intellij.platform.plugins.parser.impl.iml" filepath="$PROJECT_DIR$/platform/pluginSystem/parser/impl/intellij.platform.plugins.parser.impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/pluginSystem/testFramework/intellij.platform.plugins.testFramework.iml" filepath="$PROJECT_DIR$/platform/pluginSystem/testFramework/intellij.platform.plugins.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.iml" filepath="$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml" filepath="$PROJECT_DIR$/platform/polySymbols/backend/intellij.platform.polySymbols.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml" filepath="$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 7eaad8ec4537..6c676fea7f5f 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -714,8 +714,8 @@ platform/platform-util-netty
 platform/pluginManager/backend
 platform/pluginManager/frontend
 platform/pluginManager/shared
-platform/plugins/parser/impl
-platform/plugins/testFramework
+platform/pluginSystem/parser/impl
+platform/pluginSystem/testFramework
 platform/polySymbols
 platform/polySymbols/backend
 platform/pratt
diff --git a/platform/bootstrap/BUILD.bazel b/platform/bootstrap/BUILD.bazel
index cc1215afcb4f..9e5a4073c621 100644
--- a/platform/bootstrap/BUILD.bazel
+++ b/platform/bootstrap/BUILD.bazel
@@ -23,7 +23,7 @@ jvm_library(
     "//platform/diagnostic",
     "//platform/runtime/repository",
     "//platform/diagnostic/telemetry-impl",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
   ],
   runtime_deps = ["//platform/bootstrap/coroutine"]
 )
diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel
index 880a744975bb..9fad2a634fce 100644
--- a/platform/build-scripts/BUILD.bazel
+++ b/platform/build-scripts/BUILD.bazel
@@ -87,7 +87,7 @@ jvm_library(
     "@lib//:platform-build_scripts-netty",
     "@lib//:platform-build_scripts-jetbrains-intellij-deps-coverage-reporter",
     "//libraries/ktor/client",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//libraries/maven-resolver-provider",
     "//platform/build-scripts/product-dsl/plugin-graph",
     "//platform/build-scripts/api",
diff --git a/platform/build-scripts/product-dsl/BUILD.bazel b/platform/build-scripts/product-dsl/BUILD.bazel
index aa402eb49bfa..94d42cddeae4 100644
--- a/platform/build-scripts/product-dsl/BUILD.bazel
+++ b/platform/build-scripts/product-dsl/BUILD.bazel
@@ -20,7 +20,7 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "//libraries/fastutil",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/build-scripts/api",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
@@ -46,8 +46,8 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "//libraries/fastutil",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
     "//platform/build-scripts/api",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
diff --git a/platform/build-scripts/product-dsl/plugin-graph/BUILD.bazel b/platform/build-scripts/product-dsl/plugin-graph/BUILD.bazel
index 9b4588f581c5..68afea07e03e 100644
--- a/platform/build-scripts/product-dsl/plugin-graph/BUILD.bazel
+++ b/platform/build-scripts/product-dsl/plugin-graph/BUILD.bazel
@@ -22,7 +22,7 @@ jvm_library(
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
     "//libraries/androidx-collections",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
   ]
 )
 
@@ -39,8 +39,8 @@ jvm_library(
     "//libraries/assertj-core",
     "//libraries/kotlinx/serialization/json",
     "//libraries/androidx-collections",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
   ]
 )
 ### auto-generated section `build intellij.platform.pluginGraph` end
diff --git a/platform/build-scripts/testFramework/BUILD.bazel b/platform/build-scripts/testFramework/BUILD.bazel
index ab57d3866bd4..24c5acca9aef 100644
--- a/platform/build-scripts/testFramework/BUILD.bazel
+++ b/platform/build-scripts/testFramework/BUILD.bazel
@@ -45,8 +45,8 @@ jvm_library(
     "//platform/platform-impl/bootstrap",
     "//platform/core-impl",
     "//platform/util-class-loader:util-classLoader",
-    "//platform/plugins/testFramework",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/testFramework",
+    "//platform/pluginSystem/parser/impl",
     "//platform/util/xmlDom",
     "@lib//:tc_service_messages",
     "//platform/buildData",
diff --git a/platform/core-impl/BUILD.bazel b/platform/core-impl/BUILD.bazel
index 5b5ff9bc34c7..294e53eba4c2 100644
--- a/platform/core-impl/BUILD.bazel
+++ b/platform/core-impl/BUILD.bazel
@@ -32,7 +32,7 @@ jvm_library(
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "//platform/util/coroutines",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/syntax/syntax-api:syntax",
     "//platform/eel",
   ],
diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel
index ec7de716ea73..6280aedfa1b6 100644
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -146,7 +146,7 @@ jvm_library(
     "//platform/buildData",
     "//platform/kernel/pasta",
     "//platform/workspace/storage",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/eel",
     "//platform/platform-util-io:ide-util-io",
     "//platform/locking-impl",
@@ -316,8 +316,8 @@ jvm_library(
     "//platform/buildData",
     "//platform/kernel/pasta",
     "//platform/workspace/storage",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
     "//platform/eel",
     "//platform/platform-util-io:ide-util-io",
     "//platform/locking-impl",
diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel
index 53dfd5f90f32..78a329ed3b3f 100644
--- a/platform/platform-tests/BUILD.bazel
+++ b/platform/platform-tests/BUILD.bazel
@@ -192,13 +192,13 @@ jvm_library(
     "@lib//:io-mockk",
     "@lib//:io-mockk-jvm",
     "//platform/bookmarks",
-    "//platform/plugins/testFramework",
+    "//platform/pluginSystem/testFramework",
     "//platform/statistics/testFramework",
     "//platform/platform-impl/bootstrap/eel",
     "//platform/testFramework/junit5/projectStructure",
     "//platform/testFramework/junit5/projectStructure:projectStructure_test_lib",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
     "//platform/platform-impl/update-checker",
     "@lib//:com-jetbrains-fus-reporting-api",
     "@lib//:com-jetbrains-fus-reporting-ap-validation-all",
diff --git a/platform/pluginManager/backend/BUILD.bazel b/platform/pluginManager/backend/BUILD.bazel
index 495a54a8bf91..63d06709e34c 100644
--- a/platform/pluginManager/backend/BUILD.bazel
+++ b/platform/pluginManager/backend/BUILD.bazel
@@ -22,7 +22,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/editor-ui-api:editor-ui",
     "//platform/util",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/core-impl",
     "//platform/pluginManager/shared",
     "//platform/project/shared:project",
diff --git a/platform/pluginManager/shared/BUILD.bazel b/platform/pluginManager/shared/BUILD.bazel
index 72a39cdde997..83a897642d84 100644
--- a/platform/pluginManager/shared/BUILD.bazel
+++ b/platform/pluginManager/shared/BUILD.bazel
@@ -21,7 +21,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//libraries/kotlinx/serialization/core",
     "//platform/util",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/core-impl",
     "//platform/project/shared:project",
     "//platform/platform-impl/update-checker",
diff --git a/platform/plugins/parser/impl/BUILD.bazel b/platform/pluginSystem/parser/impl/BUILD.bazel
similarity index 100%
rename from platform/plugins/parser/impl/BUILD.bazel
rename to platform/pluginSystem/parser/impl/BUILD.bazel
diff --git a/platform/plugins/parser/impl/api-dump.txt b/platform/pluginSystem/parser/impl/api-dump.txt
similarity index 100%
rename from platform/plugins/parser/impl/api-dump.txt
rename to platform/pluginSystem/parser/impl/api-dump.txt
diff --git a/platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml b/platform/pluginSystem/parser/impl/intellij.platform.plugins.parser.impl.iml
similarity index 100%
rename from platform/plugins/parser/impl/intellij.platform.plugins.parser.impl.iml
rename to platform/pluginSystem/parser/impl/intellij.platform.plugins.parser.impl.iml
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/LoadPathUtil.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/LoadPathUtil.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/LoadPathUtil.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/LoadPathUtil.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilder.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilder.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilder.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilder.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilderImpl.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilderImpl.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilderImpl.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorBuilderImpl.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorFromXmlStreamConsumer.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorFromXmlStreamConsumer.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorFromXmlStreamConsumer.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorFromXmlStreamConsumer.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorReaderContext.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorReaderContext.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorReaderContext.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginDescriptorReaderContext.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlConst.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlConst.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlConst.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlConst.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlStreamConsumer.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlStreamConsumer.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlStreamConsumer.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/PluginXmlStreamConsumer.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/RawPluginDescriptor.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/RawPluginDescriptor.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/RawPluginDescriptor.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/RawPluginDescriptor.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainer.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainer.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainer.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainer.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilder.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilder.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilder.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilder.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilderMemoryOptimized.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilderMemoryOptimized.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilderMemoryOptimized.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerBuilderMemoryOptimized.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerImpl.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerImpl.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerImpl.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/ScopedElementsContainerImpl.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XIncludeLoader.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XIncludeLoader.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XIncludeLoader.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XIncludeLoader.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReadUtils.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReadUtils.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReadUtils.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReadUtils.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReader.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReader.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReader.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/XmlReader.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ActionElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ActionElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ActionElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ActionElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ClientKindValue.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ClientKindValue.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ClientKindValue.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ClientKindValue.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ComponentElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ComponentElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ComponentElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ComponentElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ContentModuleElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ContentModuleElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ContentModuleElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ContentModuleElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependenciesElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependenciesElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependenciesElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependenciesElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependsElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependsElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependsElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/DependsElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionPointElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionPointElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionPointElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ExtensionPointElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ListenerElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ListenerElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ListenerElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ListenerElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleLoadingRuleValue.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleLoadingRuleValue.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleLoadingRuleValue.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleLoadingRuleValue.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleVisibilityValue.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleVisibilityValue.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleVisibilityValue.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ModuleVisibilityValue.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/OSValue.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/OSValue.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/OSValue.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/OSValue.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/PreloadModeValue.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/PreloadModeValue.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/PreloadModeValue.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/PreloadModeValue.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ServiceElement.kt b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ServiceElement.kt
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ServiceElement.kt
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/ServiceElement.kt
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/package-info.java b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/package-info.java
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/package-info.java
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/elements/package-info.java
diff --git a/platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/package-info.java b/platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/package-info.java
similarity index 100%
rename from platform/plugins/parser/impl/src/com/intellij/platform/plugins/parser/impl/package-info.java
rename to platform/pluginSystem/parser/impl/src/com/intellij/platform/plugins/parser/impl/package-info.java
diff --git a/platform/plugins/parser/impl/testSrc/com/intellij/platform/plugins/parser/impl/PluginXmlParserTest.kt b/platform/pluginSystem/parser/impl/testSrc/com/intellij/platform/plugins/parser/impl/PluginXmlParserTest.kt
similarity index 100%
rename from platform/plugins/parser/impl/testSrc/com/intellij/platform/plugins/parser/impl/PluginXmlParserTest.kt
rename to platform/pluginSystem/parser/impl/testSrc/com/intellij/platform/plugins/parser/impl/PluginXmlParserTest.kt
diff --git a/platform/plugins/testFramework/BUILD.bazel b/platform/pluginSystem/testFramework/BUILD.bazel
similarity index 95%
rename from platform/plugins/testFramework/BUILD.bazel
rename to platform/pluginSystem/testFramework/BUILD.bazel
index 21aeb5e2eb86..8e5a21ebfd08 100644
--- a/platform/plugins/testFramework/BUILD.bazel
+++ b/platform/pluginSystem/testFramework/BUILD.bazel
@@ -14,7 +14,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/util-class-loader:util-classLoader",
     "//platform/diagnostic",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/util-ex",
     "//platform/platform-impl/bootstrap",
     "//platform/util/xmlDom",
diff --git a/platform/plugins/testFramework/intellij.platform.plugins.testFramework.iml b/platform/pluginSystem/testFramework/intellij.platform.plugins.testFramework.iml
similarity index 100%
rename from platform/plugins/testFramework/intellij.platform.plugins.testFramework.iml
rename to platform/pluginSystem/testFramework/intellij.platform.plugins.testFramework.iml
diff --git a/platform/plugins/testFramework/src/LoadFromSourceXIncludeLoader.kt b/platform/pluginSystem/testFramework/src/LoadFromSourceXIncludeLoader.kt
similarity index 100%
rename from platform/plugins/testFramework/src/LoadFromSourceXIncludeLoader.kt
rename to platform/pluginSystem/testFramework/src/LoadFromSourceXIncludeLoader.kt
diff --git a/platform/plugins/testFramework/src/ModuleSetResolver.kt b/platform/pluginSystem/testFramework/src/ModuleSetResolver.kt
similarity index 100%
rename from platform/plugins/testFramework/src/ModuleSetResolver.kt
rename to platform/pluginSystem/testFramework/src/ModuleSetResolver.kt
diff --git a/platform/plugins/testFramework/src/PluginDescriptorInTestLoaders.kt b/platform/pluginSystem/testFramework/src/PluginDescriptorInTestLoaders.kt
similarity index 100%
rename from platform/plugins/testFramework/src/PluginDescriptorInTestLoaders.kt
rename to platform/pluginSystem/testFramework/src/PluginDescriptorInTestLoaders.kt
diff --git a/platform/plugins/testFramework/src/PluginSetTestBuilder.kt b/platform/pluginSystem/testFramework/src/PluginSetTestBuilder.kt
similarity index 100%
rename from platform/plugins/testFramework/src/PluginSetTestBuilder.kt
rename to platform/pluginSystem/testFramework/src/PluginSetTestBuilder.kt
diff --git a/platform/plugins/testFramework/src/ValidationPluginDescriptorReaderContext.kt b/platform/pluginSystem/testFramework/src/ValidationPluginDescriptorReaderContext.kt
similarity index 100%
rename from platform/plugins/testFramework/src/ValidationPluginDescriptorReaderContext.kt
rename to platform/pluginSystem/testFramework/src/ValidationPluginDescriptorReaderContext.kt
diff --git a/platform/plugins/testFramework/src/package-info.java b/platform/pluginSystem/testFramework/src/package-info.java
similarity index 100%
rename from platform/plugins/testFramework/src/package-info.java
rename to platform/pluginSystem/testFramework/src/package-info.java
diff --git a/platform/settings-sync-core/BUILD.bazel b/platform/settings-sync-core/BUILD.bazel
index bef2ac9cb594..f95f5d81ffb6 100644
--- a/platform/settings-sync-core/BUILD.bazel
+++ b/platform/settings-sync-core/BUILD.bazel
@@ -115,7 +115,7 @@ jvm_library(
     "//platform/vcs-impl:vcs-impl_test_lib",
     "//platform/diff-impl",
     "@lib//:assert_j",
-    "//platform/plugins/testFramework",
+    "//platform/pluginSystem/testFramework",
     "//platform/platform-tests:tests_test_lib",
     "//platform/lang-api:lang",
   ],
diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel
index bdfa041d6d2b..4870d3f0d92a 100644
--- a/platform/testFramework/BUILD.bazel
+++ b/platform/testFramework/BUILD.bazel
@@ -93,7 +93,7 @@ jvm_library(
     "//platform/workspace/jps",
     "//platform/workspace/storage",
     "//platform/runtime/product",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
     "//platform/execution",
     ":libraries_junit4_provided",
     ":libraries_junit5-launcher_provided",
@@ -197,8 +197,8 @@ jvm_library(
     "//platform/testFramework/bootstrap:tools-testsBootstrap",
     "@lib//:platform-test_framework-okhttp3-mockwebserver",
     "//platform/runtime/product",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
     "//platform/execution",
     ":libraries_junit4_provided",
     ":libraries_junit5-launcher_provided",
diff --git a/plugins/ide-startup/importSettings/BUILD.bazel b/plugins/ide-startup/importSettings/BUILD.bazel
index 4e31813c7d5c..8a9e3d5db2cb 100644
--- a/plugins/ide-startup/importSettings/BUILD.bazel
+++ b/plugins/ide-startup/importSettings/BUILD.bazel
@@ -48,7 +48,7 @@ jvm_library(
     "//platform/util/progress",
     "//platform/platform-impl/ui",
     "//platform/platform-impl/initial-config-import",
-    "//platform/plugins/parser/impl",
+    "//platform/pluginSystem/parser/impl",
   ]
 )
 
@@ -98,8 +98,8 @@ jvm_library(
     "//platform/util/progress",
     "//platform/platform-impl/ui",
     "//platform/platform-impl/initial-config-import",
-    "//platform/plugins/parser/impl",
-    "//platform/plugins/parser/impl:impl_test_lib",
+    "//platform/pluginSystem/parser/impl",
+    "//platform/pluginSystem/parser/impl:impl_test_lib",
   ]
 )
 ### auto-generated section `build intellij.ide.startup.importSettings` end