diff --git a/.idea/modules.xml b/.idea/modules.xml
index 53c5255ade03..edbb35922592 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1849,8 +1849,8 @@
       <module fileurl="file://$PROJECT_DIR$/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml" filepath="$PROJECT_DIR$/python/python-sdk-configurator/frontend/intellij.python.sdkConfigurator.frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-syntax/intellij.python.syntax.iml" filepath="$PROJECT_DIR$/python/python-syntax/intellij.python.syntax.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-syntax-core/intellij.python.syntax.core.iml" filepath="$PROJECT_DIR$/python/python-syntax-core/intellij.python.syntax.core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.iml" filepath="$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.iml" />
-      <module fileurl="file://$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.tests.iml" filepath="$PROJECT_DIR$/python/python-terminal/intellij.python.terminal.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/terminal/backend/intellij.python.terminal.backend.iml" filepath="$PROJECT_DIR$/python/terminal/backend/intellij.python.terminal.backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/terminal/backend/intellij.python.terminal.tests.iml" filepath="$PROJECT_DIR$/python/terminal/backend/intellij.python.terminal.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-test-env/common/intellij.python.test.env.common.iml" filepath="$PROJECT_DIR$/python/python-test-env/common/intellij.python.test.env.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-test-env/conda/intellij.python.test.env.conda.iml" filepath="$PROJECT_DIR$/python/python-test-env/conda/intellij.python.test.env.conda.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-test-env/core/intellij.python.test.env.core.iml" filepath="$PROJECT_DIR$/python/python-test-env/core/intellij.python.test.env.core.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 0ac5475e999a..18181510b181 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1639,7 +1639,6 @@ python/python-sdk-configurator/frontend
 python/python-sdk-ui
 python/python-syntax
 python/python-syntax-core
-python/python-terminal
 python/python-test-env/common
 python/python-test-env/conda
 python/python-test-env/core
@@ -1654,6 +1653,7 @@ python/python-venv
 python/services/internal-impl
 python/services/shared
 python/services/system-python
+python/terminal/backend
 python/testFramework
 python/tools
 spellchecker
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index 9e2fd4fe296f..63ef10eefbac 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -1064,7 +1064,7 @@ jvm_library(
         # do not sort,
         "//python/IntelliLang-python:langInjection",
         "//python/python-copyright:copyright",
-        "//python/python-terminal:terminal",
+        "//python/terminal/backend",
         "//plugins/restructuredtext",
         "//python/python-grazie:grazie",
         "//python/python-markdown:markdown",
@@ -1085,7 +1085,7 @@ jvm_library(
         ":python-community-plugin-modules",
         "//python/IntelliLang-python:langInjection_test_lib",
         "//python/python-copyright:copyright_test_lib",
-        "//python/python-terminal:terminal_test_lib",
+        "//python/terminal/backend:backend_test_lib",
         "//plugins/restructuredtext:restructuredtext_test_lib",
         "//python/python-grazie:grazie_test_lib",
         "//python/python-markdown:markdown_test_lib",
diff --git a/python/intellij.python.community.plugin.modules.iml b/python/intellij.python.community.plugin.modules.iml
index f67de7614cca..0697165b262f 100644
--- a/python/intellij.python.community.plugin.modules.iml
+++ b/python/intellij.python.community.plugin.modules.iml
@@ -6,7 +6,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.python.langInjection" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.copyright" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.python.terminal" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.python.terminal.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.restructuredtext" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.grazie" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.markdown" scope="RUNTIME" />
diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml
index e878ffa3e9d6..297b4389b4f6 100644
--- a/python/pluginCore/resources/META-INF/plugin.xml
+++ b/python/pluginCore/resources/META-INF/plugin.xml
@@ -89,7 +89,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
     <module name="intellij.python.langInjection"/>
     <module name="intellij.python.markdown"/>
     <module name="intellij.python.ml.features"/>
-    <module name="intellij.python.terminal"/>
+    <module name="intellij.python.terminal.backend"/>
     <module name="intellij.python.pytools.ui"/>
     <module name="intellij.python.black"/>
   </content>
diff --git a/python/python-terminal/OWNERSHIP b/python/terminal/OWNERSHIP
similarity index 100%
rename from python/python-terminal/OWNERSHIP
rename to python/terminal/OWNERSHIP
diff --git a/python/python-terminal/BUILD.bazel b/python/terminal/backend/BUILD.bazel
similarity index 87%
rename from python/python-terminal/BUILD.bazel
rename to python/terminal/backend/BUILD.bazel
index 484564e52ac7..f26c2c6e455e 100644
--- a/python/python-terminal/BUILD.bazel
+++ b/python/terminal/backend/BUILD.bazel
@@ -1,10 +1,10 @@
 load("@community//build:tests-options.bzl", "jps_test")
 load("@rules_jvm//:jvm.bzl", "jvm_library")
 
-### auto-generated section `build intellij.python.terminal` start
+### auto-generated section `build intellij.python.terminal.backend` start
 
 jvm_library(
-    name = "terminal",
+    name = "backend",
     srcs = glob(
         [
             "src/**/*.kt",
@@ -13,7 +13,7 @@ jvm_library(
         ],
         allow_empty = True,
     ),
-    module_name = "intellij.python.terminal",
+    module_name = "intellij.python.terminal.backend",
     resource_strip_prefix = "resources",
     resources = glob(
         ["resources/**/*"],
@@ -37,17 +37,17 @@ jvm_library(
 )
 
 jvm_library(
-    name = "terminal_test_lib",
+    name = "backend_test_lib",
     testonly = True,
     srcs = glob(
         [],
         allow_empty = True,
     ),
-    module_name = "intellij.python.terminal",
+    module_name = "intellij.python.terminal.backend",
     visibility = ["//visibility:public"],
     runtime_deps = [
         # do not sort,
-        ":terminal",
+        ":backend",
         "//python:python-community-impl_test_lib",
         "//plugins/terminal:terminal_test_lib",
         "//libraries/mockito",
@@ -83,21 +83,21 @@ jvm_library(
         "//python/python-test-env/junit5:junit5_test_lib",
     ],
 )
-### auto-generated section `build intellij.python.terminal` end
+### auto-generated section `build intellij.python.terminal.backend` end
 
-### auto-generated section `iml intellij.python.terminal` start
+### auto-generated section `iml intellij.python.terminal.backend` start
 exports_files(
     [
-        "intellij.python.terminal.iml",
+        "intellij.python.terminal.backend.iml",
     ],
     visibility = ["//visibility:public"],
 )
-### auto-generated section `iml intellij.python.terminal` end
+### auto-generated section `iml intellij.python.terminal.backend` end
 
 ### auto-generated section `build intellij.python.terminal.tests` start
 
 jvm_library(
-    name = "terminal-tests",
+    name = "python-terminal-tests",
     srcs = glob(
         [],
         allow_empty = True,
@@ -107,7 +107,7 @@ jvm_library(
 )
 
 jvm_library(
-    name = "terminal-tests_test_lib",
+    name = "python-terminal-tests_test_lib",
     testonly = True,
     srcs = glob(
         [
@@ -118,15 +118,15 @@ jvm_library(
         allow_empty = True,
     ),
     associates = [
-        "//python/python-terminal:terminal",
-        "//python/python-terminal:terminal_test_lib",
+        "//python/terminal/backend",
+        "//python/terminal/backend:backend_test_lib",
     ],
     resource_strip_prefix = "testResources",
     resources = glob(
         ["testResources/**/*"],
     ),
     visibility = ["//visibility:public"],
-    runtime_deps = [":terminal-tests"],
+    runtime_deps = [":python-terminal-tests"],
     deps = [
         # do not sort,
         "//python:python-community-impl",
@@ -184,7 +184,7 @@ exports_files(
 ### auto-generated section `test intellij.python.terminal.tests` start
 
 jps_test(
-    name = "terminal-tests_test",
-    runtime_deps = [":terminal-tests_test_lib"],
+    name = "python-terminal-tests_test",
+    runtime_deps = [":python-terminal-tests_test_lib"],
 )
 ### auto-generated section `test intellij.python.terminal.tests` end
diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/terminal/backend/intellij.python.terminal.backend.iml
similarity index 100%
rename from python/python-terminal/intellij.python.terminal.iml
rename to python/terminal/backend/intellij.python.terminal.backend.iml
index 9a80260bafbc..3c804389ecd3 100644
--- a/python/python-terminal/intellij.python.terminal.iml
+++ b/python/terminal/backend/intellij.python.terminal.backend.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/python/python-terminal/intellij.python.terminal.tests.iml b/python/terminal/backend/intellij.python.terminal.tests.iml
similarity index 97%
rename from python/python-terminal/intellij.python.terminal.tests.iml
rename to python/terminal/backend/intellij.python.terminal.tests.iml
index f8481da1dc8a..179c5cd10003 100644
--- a/python/python-terminal/intellij.python.terminal.tests.iml
+++ b/python/terminal/backend/intellij.python.terminal.tests.iml
@@ -30,7 +30,7 @@
     <orderEntry type="module" module-name="intellij.libraries.junit5.pioneer" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.test.env.junit5" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.python.terminal" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.python.terminal.backend" scope="TEST" />
   </component>
-  <component name="TestModuleProperties" production-module="intellij.python.terminal" />
+  <component name="TestModuleProperties" production-module="intellij.python.terminal.backend" />
 </module>
\ No newline at end of file
diff --git a/python/python-terminal/resources/intellij.python.terminal.xml b/python/terminal/backend/resources/intellij.python.terminal.backend.xml
similarity index 100%
rename from python/python-terminal/resources/intellij.python.terminal.xml
rename to python/terminal/backend/resources/intellij.python.terminal.backend.xml
diff --git a/python/python-terminal/resources/messages/PyTerminalBundle.properties b/python/terminal/backend/resources/messages/PyTerminalBundle.properties
similarity index 100%
rename from python/python-terminal/resources/messages/PyTerminalBundle.properties
rename to python/terminal/backend/resources/messages/PyTerminalBundle.properties
diff --git a/python/python-terminal/src/com/intellij/python/terminal/PyTerminalBundle.java b/python/terminal/backend/src/com/intellij/python/terminal/PyTerminalBundle.java
similarity index 100%
rename from python/python-terminal/src/com/intellij/python/terminal/PyTerminalBundle.java
rename to python/terminal/backend/src/com/intellij/python/terminal/PyTerminalBundle.java
diff --git a/python/python-terminal/src/com/intellij/python/terminal/PyVirtualEnvTerminalCustomizer.kt b/python/terminal/backend/src/com/intellij/python/terminal/PyVirtualEnvTerminalCustomizer.kt
similarity index 100%
rename from python/python-terminal/src/com/intellij/python/terminal/PyVirtualEnvTerminalCustomizer.kt
rename to python/terminal/backend/src/com/intellij/python/terminal/PyVirtualEnvTerminalCustomizer.kt
diff --git a/python/python-terminal/testResources/intellij.python.terminal.tests.xml b/python/terminal/backend/testResources/intellij.python.terminal.tests.xml
similarity index 92%
rename from python/python-terminal/testResources/intellij.python.terminal.tests.xml
rename to python/terminal/backend/testResources/intellij.python.terminal.tests.xml
index a90cc1514fd2..ffba97b676ad 100644
--- a/python/python-terminal/testResources/intellij.python.terminal.tests.xml
+++ b/python/terminal/backend/testResources/intellij.python.terminal.tests.xml
@@ -3,7 +3,7 @@
   <dependencies>
     <module name="intellij.libraries.junit5.pioneer"/>
     <module name="intellij.python.venv.tests._test"/>
-    <module name="intellij.python.terminal"/>
+    <module name="intellij.python.terminal.backend"/>
     <module name="intellij.libraries.junit5"/>
     <module name="intellij.libraries.junit5.params"/>
     <module name="intellij.platform.core"/>
diff --git a/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyTerminalDefaultWorkingDirectoryTest.kt b/python/terminal/backend/tests/com/intellij/python/junit5Tests/env/terminal/PyTerminalDefaultWorkingDirectoryTest.kt
similarity index 100%
rename from python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyTerminalDefaultWorkingDirectoryTest.kt
rename to python/terminal/backend/tests/com/intellij/python/junit5Tests/env/terminal/PyTerminalDefaultWorkingDirectoryTest.kt
diff --git a/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt b/python/terminal/backend/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt
similarity index 100%
rename from python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt
rename to python/terminal/backend/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt