diff --git a/xml/xml-psi-impl/mdn-doc-gen/intellij.documenation.mdn.gen.iml b/xml/xml-psi-impl/mdn-doc-gen/intellij.documenation.mdn.gen.iml
index 1bc6fc8ddda4..4c4c41e046f0 100644
--- a/xml/xml-psi-impl/mdn-doc-gen/intellij.documenation.mdn.gen.iml
+++ b/xml/xml-psi-impl/mdn-doc-gen/intellij.documenation.mdn.gen.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.relaxng" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.javascript.impl" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="library" name="jackson" level="project" />
@@ -35,5 +34,10 @@
     <orderEntry type="module" module-name="intellij.html.tools.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.react.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.astro.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.angular.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.javascript.analysis.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.javascript.psi.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.idea.ultimate.tests.main" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xml-psi-impl/mdn-doc-gen/src/GenerateMdnDocumentation.kt b/xml/xml-psi-impl/mdn-doc-gen/src/GenerateMdnDocumentation.kt
index 133dde83597d..1947ebd70dcf 100644
--- a/xml/xml-psi-impl/mdn-doc-gen/src/GenerateMdnDocumentation.kt
+++ b/xml/xml-psi-impl/mdn-doc-gen/src/GenerateMdnDocumentation.kt
@@ -7,9 +7,9 @@ import com.intellij.bcd.json.*
 import com.intellij.documentation.mdn.*
 import com.intellij.ide.highlighter.HtmlFileType
 import com.intellij.lang.html.HTMLLanguage
+import com.intellij.lang.javascript.index.JSIndexKeys
 import com.intellij.lang.javascript.library.JSCorePredefinedLibrariesProvider
 import com.intellij.lang.javascript.psi.JSPsiElementBase
-import com.intellij.lang.javascript.psi.stubs.JSSymbolIndex2
 import com.intellij.lang.javascript.psi.types.JSNamedTypeFactory
 import com.intellij.lang.javascript.psi.types.JSTypeContext
 import com.intellij.lang.javascript.psi.types.JSTypeSourceFactory
@@ -1171,7 +1171,7 @@ class GenerateMdnDocumentation : BasePlatformTestCase() {
       .find { it.name == "lib.dom.d.ts" }
       ?.let { PsiManager.getInstance(project).findFile(it) }
 
-    val realNameMap = StubIndex.getInstance().getAllKeys(JSSymbolIndex2.KEY, project)
+    val realNameMap = StubIndex.getInstance().getAllKeys(JSIndexKeys.JS_SYMBOL_INDEX_2_KEY, project)
       .associateBy { it.lowercase(Locale.US) }
 
     return symbols.keys.asSequence()
diff --git a/xml/xml-psi-impl/mdn-doc-gen/src/MdnDocUpdateTestSuite.kt b/xml/xml-psi-impl/mdn-doc-gen/src/MdnDocUpdateTestSuite.kt
index 2839138a4b33..200d07c72e9c 100644
--- a/xml/xml-psi-impl/mdn-doc-gen/src/MdnDocUpdateTestSuite.kt
+++ b/xml/xml-psi-impl/mdn-doc-gen/src/MdnDocUpdateTestSuite.kt
@@ -1,12 +1,12 @@
 import com.intellij.codeInsight.XmlDocumentationTest
 import com.intellij.html.HtmlDocumentationTest
 import com.intellij.htmltools.codeInsight.daemon.HtmlHighlightingTest
-import com.intellij.javascript.polySymbols.css.PolySymbolsCssCodeCompletionTest
-import com.intellij.javascript.polySymbols.html.PolySymbolsHtmlDocumentationTest
-import com.intellij.javascript.polySymbols.html.PolySymbolsHtmlLookupDocumentationTest
 import com.intellij.lang.javascript.JSDocumentationTest
 import com.intellij.lang.javascript.typescript.TypeScriptDocumentationTest
 import com.intellij.lang.javascript.typescript.service.TypeScriptServiceDocumentationTest
+import com.intellij.polySymbols.js.css.PolySymbolsCssCodeCompletionTest
+import com.intellij.polySymbols.js.html.PolySymbolsHtmlDocumentationTest
+import com.intellij.polySymbols.js.html.PolySymbolsHtmlLookupDocumentationTest
 import com.intellij.react.ReactDocumentationTest
 import com.intellij.react.tsc.ReactDocumentationWithServiceTest
 import css.CssDocumentationTest