diff --git a/.idea/modules.xml b/.idea/modules.xml
index cd1733ce100d..8aaf628f5f20 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -639,6 +639,10 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/evaluation-plugin/languages/kotlin/intellij.evaluationPlugin.languages.kotlin.iml" filepath="$PROJECT_DIR$/plugins/evaluation-plugin/languages/kotlin/intellij.evaluationPlugin.languages.kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml" filepath="$PROJECT_DIR$/plugins/evaluation-plugin/languages/python/intellij.evaluationPlugin.languages.python.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml" filepath="$PROJECT_DIR$/plugins/evaluation-plugin/intellij.evaluationPlugin.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/elevation/intellij.execution.process.elevation.iml" filepath="$PROJECT_DIR$/platform/elevation/intellij.execution.process.elevation.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/elevation/client/intellij.execution.process.mediator.client.iml" filepath="$PROJECT_DIR$/platform/elevation/client/intellij.execution.process.mediator.client.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/elevation/common/intellij.execution.process.mediator.common.iml" filepath="$PROJECT_DIR$/platform/elevation/common/intellij.execution.process.mediator.common.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml" filepath="$PROJECT_DIR$/platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ide-features-trainer/intellij.featuresTrainer.iml" filepath="$PROJECT_DIR$/plugins/ide-features-trainer/intellij.featuresTrainer.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/filePrediction/intellij.filePrediction.iml" filepath="$PROJECT_DIR$/plugins/filePrediction/intellij.filePrediction.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/intellij.gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/intellij.gradle.iml" />
@@ -892,10 +896,6 @@
       <module fileurl="file://$PROJECT_DIR$/platform/platform-tests/durability/intellij.platform.durability.iml" filepath="$PROJECT_DIR$/platform/platform-tests/durability/intellij.platform.durability.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/intellij.platform.editor.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/intellij.platform.editor.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-ex/intellij.platform.editor.ex.iml" filepath="$PROJECT_DIR$/platform/editor-ui-ex/intellij.platform.editor.ex.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/elevation/intellij.platform.elevation.iml" filepath="$PROJECT_DIR$/platform/elevation/intellij.platform.elevation.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/elevation/client/intellij.platform.elevation.client.iml" filepath="$PROJECT_DIR$/platform/elevation/client/intellij.platform.elevation.client.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/elevation/common/intellij.platform.elevation.common.iml" filepath="$PROJECT_DIR$/platform/elevation/common/intellij.platform.elevation.common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/elevation/daemon/intellij.platform.elevation.daemon.iml" filepath="$PROJECT_DIR$/platform/elevation/daemon/intellij.platform.elevation.daemon.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/execution/intellij.platform.execution.iml" filepath="$PROJECT_DIR$/platform/execution/intellij.platform.execution.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/execution-impl/intellij.platform.execution.impl.iml" filepath="$PROJECT_DIR$/platform/execution-impl/intellij.platform.execution.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/execution-impl/intellij.platform.execution.tests.iml" filepath="$PROJECT_DIR$/platform/execution-impl/intellij.platform.execution.tests.iml" />
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 0f3e0576af81..83568226d647 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -52,7 +52,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = persistentListOf(
   "intellij.platform.analysis.impl",
   "intellij.platform.diff.impl",
   "intellij.platform.editor.ex",
-  "intellij.platform.elevation",
+  "intellij.execution.process.elevation",
   "intellij.platform.externalProcessAuthHelper",
   "intellij.platform.inspect",
   // lvcs.xml - convert into product module
diff --git a/platform/elevation/client/intellij.platform.elevation.client.iml b/platform/elevation/client/intellij.execution.process.mediator.client.iml
similarity index 92%
rename from platform/elevation/client/intellij.platform.elevation.client.iml
rename to platform/elevation/client/intellij.execution.process.mediator.client.iml
index 640092e1d680..87541269bb9d 100644
--- a/platform/elevation/client/intellij.platform.elevation.client.iml
+++ b/platform/elevation/client/intellij.execution.process.mediator.client.iml
@@ -16,8 +16,8 @@
     <orderEntry type="library" name="grpc-stub" level="project" />
     <orderEntry type="library" name="grpc-protobuf" level="project" />
     <orderEntry type="library" name="grpc-kotlin-stub" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.daemon" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.common" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.daemon" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.common" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
diff --git a/platform/elevation/common/intellij.platform.elevation.common.iml b/platform/elevation/common/intellij.execution.process.mediator.common.iml
similarity index 100%
rename from platform/elevation/common/intellij.platform.elevation.common.iml
rename to platform/elevation/common/intellij.execution.process.mediator.common.iml
diff --git a/platform/elevation/daemon/intellij.platform.elevation.daemon.iml b/platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml
similarity index 93%
rename from platform/elevation/daemon/intellij.platform.elevation.daemon.iml
rename to platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml
index 5ac82968aee5..f80632e40226 100644
--- a/platform/elevation/daemon/intellij.platform.elevation.daemon.iml
+++ b/platform/elevation/daemon/intellij.execution.process.mediator.daemon.iml
@@ -18,6 +18,6 @@
     <orderEntry type="library" name="grpc-netty-shaded" level="project" />
     <orderEntry type="library" name="grpc-kotlin-stub" level="project" />
     <orderEntry type="library" name="jna" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.common" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.common" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/elevation/intellij.platform.elevation.iml b/platform/elevation/intellij.execution.process.elevation.iml
similarity index 77%
rename from platform/elevation/intellij.platform.elevation.iml
rename to platform/elevation/intellij.execution.process.elevation.iml
index 549020744529..bffe7cb65bc0 100644
--- a/platform/elevation/intellij.platform.elevation.iml
+++ b/platform/elevation/intellij.execution.process.elevation.iml
@@ -11,9 +11,9 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="grpc-core" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.client" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.daemon" />
-    <orderEntry type="module" module-name="intellij.platform.elevation.common" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.client" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.daemon" />
+    <orderEntry type="module" module-name="intellij.execution.process.mediator.common" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="library" name="jna" level="project" />
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 19e61a52a25a..bb02e6dfe617 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -114,7 +114,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="classgraph" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.elevation" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.execution.process.elevation" scope="RUNTIME" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics.uploader" />
     <orderEntry type="library" name="zip-signer" level="project" />