diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8b367df7fd3f..b3529066c10d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -479,7 +479,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/junit/testFramework/intellij.junit.testFramework.iml" filepath="$PROJECT_DIR$/plugins/junit/testFramework/intellij.junit.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/junit5_rt/intellij.junit.v5.rt.iml" filepath="$PROJECT_DIR$/plugins/junit5_rt/intellij.junit.v5.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml" filepath="$PROJECT_DIR$/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jupyter/intellij.jupyter.core.iml" filepath="$PROJECT_DIR$/jupyter/intellij.jupyter.core.iml" />
       <module fileurl="file://$PROJECT_DIR$/jupyter/viewOnly/intellij.jupyter.viewOnly.iml" filepath="$PROJECT_DIR$/jupyter/viewOnly/intellij.jupyter.viewOnly.iml" />
       <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-api/intellij.jvm.analysis.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-api/intellij.jvm.analysis.iml" />
       <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" />
@@ -546,6 +545,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jupyter/intellij.notebooks.jupyter.core.iml" filepath="$PROJECT_DIR$/jupyter/intellij.notebooks.jupyter.core.iml" />
       <module fileurl="file://$PROJECT_DIR$/notebooks/notebook-ui/intellij.notebooks.ui.iml" filepath="$PROJECT_DIR$/notebooks/notebook-ui/intellij.notebooks.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/notebooks/visualization/intellij.notebooks.visualization.iml" filepath="$PROJECT_DIR$/notebooks/visualization/intellij.notebooks.visualization.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" />
diff --git a/jupyter/gen/com/intellij/jupyter/core/icons/JupyterCoreIcons.java b/jupyter/gen/com/intellij/notebooks/jupyter/core/icons/JupyterCoreIcons.java
similarity index 95%
rename from jupyter/gen/com/intellij/jupyter/core/icons/JupyterCoreIcons.java
rename to jupyter/gen/com/intellij/notebooks/jupyter/core/icons/JupyterCoreIcons.java
index 6ea8a535d7b9..b80257b72ae5 100644
--- a/jupyter/gen/com/intellij/jupyter/core/icons/JupyterCoreIcons.java
+++ b/jupyter/gen/com/intellij/notebooks/jupyter/core/icons/JupyterCoreIcons.java
@@ -1,4 +1,4 @@
-package com.intellij.jupyter.core.icons;
+package com.intellij.notebooks.jupyter.core.icons;
 
 import com.intellij.ui.IconManager;
 import org.jetbrains.annotations.NotNull;
diff --git a/jupyter/intellij.jupyter.core.iml b/jupyter/intellij.notebooks.jupyter.core.iml
similarity index 100%
rename from jupyter/intellij.jupyter.core.iml
rename to jupyter/intellij.notebooks.jupyter.core.iml
diff --git a/jupyter/resources/intellij.jupyter.core.xml b/jupyter/resources/intellij.notebooks.jupyter.core.xml
similarity index 61%
rename from jupyter/resources/intellij.jupyter.core.xml
rename to jupyter/resources/intellij.notebooks.jupyter.core.xml
index 070f4c87ca9a..b2cb555003f1 100644
--- a/jupyter/resources/intellij.jupyter.core.xml
+++ b/jupyter/resources/intellij.notebooks.jupyter.core.xml
@@ -1,10 +1,10 @@
-<idea-plugin package="com.intellij.jupyter.core">
+<idea-plugin package="com.intellij.notebooks.jupyter.core">
   <!-- Jupyter language -->
     <extensions defaultExtensionNs="com.intellij">
       <fileType name="Jupyter"
                 language="Jupyter"
                 extensions="ipynb"
-                implementationClass="com.intellij.jupyter.core.jupyter.JupyterFileType"
+                implementationClass="com.intellij.notebooks.jupyter.core.jupyter.JupyterFileType"
                 fieldName="INSTANCE"/>
     </extensions>
 </idea-plugin>
diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterFileType.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterFileType.kt
similarity index 86%
rename from jupyter/src/com/intellij/jupyter/core/jupyter/JupyterFileType.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterFileType.kt
index 1c0fbbefd42e..07948cd1d213 100644
--- a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterFileType.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterFileType.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.jupyter.core.jupyter
+package com.intellij.notebooks.jupyter.core.jupyter
 
 import com.intellij.openapi.fileTypes.LanguageFileType
 import com.intellij.openapi.vfs.CharsetToolkit
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.jupyter.core.icons.JupyterCoreIcons
+import com.intellij.notebooks.jupyter.core.icons.JupyterCoreIcons
 import org.jetbrains.annotations.NonNls
 import javax.swing.Icon
 
diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterLanguage.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterLanguage.kt
similarity index 79%
rename from jupyter/src/com/intellij/jupyter/core/jupyter/JupyterLanguage.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterLanguage.kt
index 96aa17dcd4b5..18e842df636c 100644
--- a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterLanguage.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterLanguage.kt
@@ -1,10 +1,10 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.jupyter.core.jupyter
+package com.intellij.notebooks.jupyter.core.jupyter
 
 import com.intellij.lang.Language
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.fileTypes.LanguageFileType
-import com.intellij.jupyter.core.lang.NotebookLanguage
+import com.intellij.notebooks.jupyter.core.lang.NotebookLanguage
 
 object JupyterLanguage : Language(NotebookLanguage, "Jupyter")
 
diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterPsiBundle.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterPsiBundle.kt
similarity index 91%
rename from jupyter/src/com/intellij/jupyter/core/jupyter/JupyterPsiBundle.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterPsiBundle.kt
index 46d5fc80eb9b..b3a7b994b82c 100644
--- a/jupyter/src/com/intellij/jupyter/core/jupyter/JupyterPsiBundle.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterPsiBundle.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.jupyter.core.jupyter
+package com.intellij.notebooks.jupyter.core.jupyter
 
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.Nls
diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
similarity index 98%
rename from jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
index 6956c3a175cb..422028cb02b2 100644
--- a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.jupyter.core.jupyter.preview
+package com.intellij.notebooks.jupyter.core.jupyter.preview
 
 
 import com.intellij.ide.plugins.cl.PluginAwareClassLoader
diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterHttpUtils.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
similarity index 94%
rename from jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
index 03d552738e59..31724a5cb242 100644
--- a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.jupyter.core.jupyter.preview
+package com.intellij.notebooks.jupyter.core.jupyter.preview
 
 import org.apache.http.client.utils.URIBuilder
 import org.jetbrains.ide.BuiltInServerManager
diff --git a/jupyter/src/com/intellij/jupyter/core/lang/NotebookLanguage.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/lang/NotebookLanguage.kt
similarity index 83%
rename from jupyter/src/com/intellij/jupyter/core/lang/NotebookLanguage.kt
rename to jupyter/src/com/intellij/notebooks/jupyter/core/lang/NotebookLanguage.kt
index 79c130a9c2ba..3ecd468e7789 100644
--- a/jupyter/src/com/intellij/jupyter/core/lang/NotebookLanguage.kt
+++ b/jupyter/src/com/intellij/notebooks/jupyter/core/lang/NotebookLanguage.kt
@@ -1,4 +1,4 @@
-package com.intellij.jupyter.core.lang
+package com.intellij.notebooks.jupyter.core.lang
 
 import com.intellij.lang.Language
 
diff --git a/jupyter/viewOnly/intellij.jupyter.viewOnly.iml b/jupyter/viewOnly/intellij.jupyter.viewOnly.iml
index df38fa58664e..240e6eab1268 100644
--- a/jupyter/viewOnly/intellij.jupyter.viewOnly.iml
+++ b/jupyter/viewOnly/intellij.jupyter.viewOnly.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.jupyter.core" />
+    <orderEntry type="module" module-name="intellij.notebooks.jupyter.core" />
     <orderEntry type="module" module-name="intellij.platform.editor" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="library" name="jcef" level="project" />
diff --git a/jupyter/viewOnly/resources/intellij.jupyter.viewOnly.xml b/jupyter/viewOnly/resources/intellij.jupyter.viewOnly.xml
index 860bceefdad0..cb8ad318e871 100644
--- a/jupyter/viewOnly/resources/intellij.jupyter.viewOnly.xml
+++ b/jupyter/viewOnly/resources/intellij.jupyter.viewOnly.xml
@@ -1,7 +1,7 @@
 <!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
 <idea-plugin package="com.intellij.jupyter.viewOnly">
   <dependencies>
-    <module name="intellij.jupyter.core"/>
+    <module name="intellij.notebooks.jupyter.core"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt
index 71ee446321de..bf6fd718af0e 100644
--- a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt
+++ b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt
@@ -3,8 +3,8 @@ package com.intellij.jupyter.viewOnly
 
 
 import com.intellij.ide.ui.LafManagerListener
-import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
-import com.intellij.jupyter.core.jupyter.preview.addPathSegment
+import com.intellij.notebooks.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
+import com.intellij.notebooks.jupyter.core.jupyter.preview.addPathSegment
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
diff --git a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt
index c3148ec9307c..6d054a1103f1 100644
--- a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt
+++ b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.jupyter.viewOnly
 
-import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
+import com.intellij.notebooks.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
 
 class JupyterViewOnlyHandler : JupyterCefHttpHandlerBase(absolutePathFiles = listOf(
   "/ipywidgets.html",
diff --git a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt
index 4e2c45924c69..a9f96f717400 100644
--- a/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt
+++ b/jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.fileTypes.FileTypeRegistry
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.jupyter.core.jupyter.JupyterFileType
+import com.intellij.notebooks.jupyter.core.jupyter.JupyterFileType
 
 internal class JupyterViewOnlyProvider : FileEditorProvider, DumbAware {
   override fun accept(project: Project, file: VirtualFile): Boolean = FileTypeRegistry.getInstance().isFileOfType(file, JupyterFileType)
diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
index e382bafd3e84..b486248a4135 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
@@ -71,9 +71,9 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
         iconDirectory = "icons/com/jetbrains/localization",
       )
 
-      "intellij.jupyter.core"-> IntellijIconClassGeneratorModuleConfig(
+      "intellij.notebooks.jupyter.core"-> IntellijIconClassGeneratorModuleConfig(
         className = "JupyterCoreIcons",
-        packageName = "com.intellij.jupyter.core.icons",
+        packageName = "com.intellij.notebooks.jupyter.core.icons",
         iconDirectory = "icons/org.jetbrains.plugins.notebooks.jupyter",
       )
 
diff --git a/plugins/ide-startup/importSettings/resources/pluginData/ds.json b/plugins/ide-startup/importSettings/resources/pluginData/ds.json
index 1d075151ccf3..db29db7eccec 100644
--- a/plugins/ide-startup/importSettings/resources/pluginData/ds.json
+++ b/plugins/ide-startup/importSettings/resources/pluginData/ds.json
@@ -216,8 +216,8 @@
   },
   {
     "vsCodeId": "ms-toolsai.jupyter",
-    "ideaName": "Python Support for Jupyter",
-    "ideaId": "intellij.jupyter.py"
+    "ideaName": "Jupyter",
+    "ideaId": "intellij.jupyter"
   },
   {
     "vsCodeId": "ms-vscode-remote.remote-containers",
diff --git a/plugins/ide-startup/importSettings/resources/pluginData/iu.json b/plugins/ide-startup/importSettings/resources/pluginData/iu.json
index cab83e1c8a18..98c4c3afbd16 100644
--- a/plugins/ide-startup/importSettings/resources/pluginData/iu.json
+++ b/plugins/ide-startup/importSettings/resources/pluginData/iu.json
@@ -276,8 +276,8 @@
   },
   {
     "vsCodeId": "ms-toolsai.jupyter",
-    "ideaName": "Python Support for Jupyter",
-    "ideaId": "intellij.jupyter.py"
+    "ideaName": "Jupyter",
+    "ideaId": "intellij.jupyter"
   },
   {
     "vsCodeId": "ms-vscode-remote.remote-containers",
diff --git a/plugins/ide-startup/importSettings/resources/pluginData/pp.json b/plugins/ide-startup/importSettings/resources/pluginData/pp.json
index 8717a4920a2e..521bfe0b330c 100644
--- a/plugins/ide-startup/importSettings/resources/pluginData/pp.json
+++ b/plugins/ide-startup/importSettings/resources/pluginData/pp.json
@@ -251,8 +251,8 @@
   },
   {
     "vsCodeId": "ms-toolsai.jupyter",
-    "ideaName": "Python Support for Jupyter",
-    "ideaId": "intellij.jupyter.py"
+    "ideaName": "Jupyter",
+    "ideaId": "intellij.jupyter"
   },
   {
     "vsCodeId": "ms-vscode-remote.remote-containers",
diff --git a/python/testSrc/intellij.python.community.tests.iml b/python/testSrc/intellij.python.community.tests.iml
index c627a7be857f..902d85d2a869 100644
--- a/python/testSrc/intellij.python.community.tests.iml
+++ b/python/testSrc/intellij.python.community.tests.iml
@@ -43,7 +43,7 @@
     <orderEntry type="module" module-name="intellij.python.markdown" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.notebooks.visualization" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.featuresTrainer" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.jupyter.core" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.notebooks.jupyter.core" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.grazie.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.grazie" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />