diff --git a/.idea/modules.xml b/.idea/modules.xml
index ef3aa2a95a23..fad3e7ec3fa5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1072,10 +1072,10 @@
       <module fileurl="file://$PROJECT_DIR$/xml/dom-openapi/intellij.xml.dom.iml" filepath="$PROJECT_DIR$/xml/dom-openapi/intellij.xml.dom.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/dom-impl/intellij.xml.dom.impl.iml" filepath="$PROJECT_DIR$/xml/dom-impl/intellij.xml.dom.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/dom-tests/intellij.xml.dom.tests.iml" filepath="$PROJECT_DIR$/xml/dom-tests/intellij.xml.dom.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/xml/xml-frontback/intellij.xml.frontback.iml" filepath="$PROJECT_DIR$/xml/xml-frontback/intellij.xml.frontback.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml" filepath="$PROJECT_DIR$/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/intellij.xml.impl.iml" filepath="$PROJECT_DIR$/xml/impl/intellij.xml.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/xml-parser/intellij.xml.parser.iml" filepath="$PROJECT_DIR$/xml/xml-parser/intellij.xml.parser.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-api/intellij.xml.psi.iml" filepath="$PROJECT_DIR$/xml/xml-psi-api/intellij.xml.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-impl/intellij.xml.psi.impl.iml" filepath="$PROJECT_DIR$/xml/xml-psi-impl/intellij.xml.psi.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-structure-view-api/intellij.xml.structureView.iml" filepath="$PROJECT_DIR$/xml/xml-structure-view-api/intellij.xml.structureView.iml" />
diff --git a/grid/impl/intellij.grid.impl.iml b/grid/impl/intellij.grid.impl.iml
index c54cbb14cf1c..d1f968bba02b 100644
--- a/grid/impl/intellij.grid.impl.iml
+++ b/grid/impl/intellij.grid.impl.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diff" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
diff --git a/images/backend.svg/intellij.platform.images.backend.svg.iml b/images/backend.svg/intellij.platform.images.backend.svg.iml
index a4c0ee429ee9..2d95320dcfe4 100644
--- a/images/backend.svg/intellij.platform.images.backend.svg.iml
+++ b/images/backend.svg/intellij.platform.images.backend.svg.iml
@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml
index aa5ae742d0e6..c938c62f6ed2 100644
--- a/images/intellij.platform.images.iml
+++ b/images/intellij.platform.images.iml
@@ -43,7 +43,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml
index 29de1115967e..1880adf96e9c 100644
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" exported="" />
+    <orderEntry type="module" module-name="intellij.xml.parser" exported="" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.iml b/platform/structuralsearch/intellij.platform.structuralSearch.iml
index 80a034bca63b..bf471f68bcee 100644
--- a/platform/structuralsearch/intellij.platform.structuralSearch.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.regexp" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" exported="" />
diff --git a/plugins/IntelliLang/intellij.platform.langInjection.iml b/plugins/IntelliLang/intellij.platform.langInjection.iml
index eec9b59127a2..defd47450828 100644
--- a/plugins/IntelliLang/intellij.platform.langInjection.iml
+++ b/plugins/IntelliLang/intellij.platform.langInjection.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
diff --git a/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml b/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml
index d9730776fa2a..c551ff3cf8f6 100644
--- a/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml
+++ b/plugins/IntelliLang/xml-support/intellij.xml.langInjection.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="Jaxen" level="project" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
diff --git a/plugins/grazie/xml/intellij.grazie.xml.iml b/plugins/grazie/xml/intellij.grazie.xml.iml
index 128d2053a4f4..928be8791a43 100644
--- a/plugins/grazie/xml/intellij.grazie.xml.iml
+++ b/plugins/grazie/xml/intellij.grazie.xml.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/htmltools/intellij.html.tools.iml b/plugins/htmltools/intellij.html.tools.iml
index 42779248166c..fbb970c673e3 100644
--- a/plugins/htmltools/intellij.html.tools.iml
+++ b/plugins/htmltools/intellij.html.tools.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.images" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
diff --git a/plugins/markdown/images/intellij.markdown.images.iml b/plugins/markdown/images/intellij.markdown.images.iml
index 84641c1ab744..c95de78ba2a9 100644
--- a/plugins/markdown/images/intellij.markdown.images.iml
+++ b/plugins/markdown/images/intellij.markdown.images.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.images" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.backend" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
diff --git a/plugins/markdown/model/intellij.markdown.model.iml b/plugins/markdown/model/intellij.markdown.model.iml
index 553468c09ee6..9cce93b8b045 100644
--- a/plugins/markdown/model/intellij.markdown.model.iml
+++ b/plugins/markdown/model/intellij.markdown.model.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.backend" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
   </component>
diff --git a/plugins/markdown/test/intellij.markdown.tests.iml b/plugins/markdown/test/intellij.markdown.tests.iml
index cf10bfefed2b..23d4b10e69b8 100644
--- a/plugins/markdown/test/intellij.markdown.tests.iml
+++ b/plugins/markdown/test/intellij.markdown.tests.iml
@@ -24,7 +24,7 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/markdown/xml/intellij.markdown.xml.iml b/plugins/markdown/xml/intellij.markdown.xml.iml
index d676249f547a..75109f006bde 100644
--- a/plugins/markdown/xml/intellij.markdown.xml.iml
+++ b/plugins/markdown/xml/intellij.markdown.xml.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.backend" />
diff --git a/plugins/xpath/intellij.xpath.iml b/plugins/xpath/intellij.xpath.iml
index 2136b9acaabf..6851cd9a840a 100644
--- a/plugins/xpath/intellij.xpath.iml
+++ b/plugins/xpath/intellij.xpath.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.regexp" />
diff --git a/plugins/xslt-debugger/intellij.xslt.debugger.iml b/plugins/xslt-debugger/intellij.xslt.debugger.iml
index c865ce5c025a..e1b2b58c70f3 100644
--- a/plugins/xslt-debugger/intellij.xslt.debugger.iml
+++ b/plugins/xslt-debugger/intellij.xslt.debugger.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.xpath" />
     <orderEntry type="module" module-name="intellij.xslt.debugger.rt" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
diff --git a/xml/dom-impl/intellij.xml.dom.impl.iml b/xml/dom-impl/intellij.xml.dom.impl.iml
index bb7214361c87..48446b0f32a5 100644
--- a/xml/dom-impl/intellij.xml.dom.impl.iml
+++ b/xml/dom-impl/intellij.xml.dom.impl.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.xml.structureView" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.xml" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
diff --git a/xml/impl/intellij.xml.impl.iml b/xml/impl/intellij.xml.impl.iml
index b25512bdb49f..02064e1f444b 100644
--- a/xml/impl/intellij.xml.impl.iml
+++ b/xml/impl/intellij.xml.impl.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
diff --git a/xml/relaxng/intellij.relaxng.iml b/xml/relaxng/intellij.relaxng.iml
index 67a80e554296..c15e1e8db9bd 100644
--- a/xml/relaxng/intellij.relaxng.iml
+++ b/xml/relaxng/intellij.relaxng.iml
@@ -73,7 +73,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
index 53aff32bdeb8..7ab84d3e058f 100644
--- a/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
+++ b/xml/xml-analysis-impl/intellij.xml.analysis.impl.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="intellij.xml.analysis" exported="" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml b/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml
index 35cd96784d6e..96ba8f815fba 100644
--- a/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml
+++ b/xml/xml-frontback-impl/intellij.xml.frontback.impl.iml
@@ -11,6 +11,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xml-frontback/BUILD.bazel b/xml/xml-parser/BUILD.bazel
similarity index 100%
rename from xml/xml-frontback/BUILD.bazel
rename to xml/xml-parser/BUILD.bazel
diff --git a/xml/xml-frontback/intellij.xml.frontback.iml b/xml/xml-parser/intellij.xml.parser.iml
similarity index 100%
rename from xml/xml-frontback/intellij.xml.frontback.iml
rename to xml/xml-parser/intellij.xml.parser.iml
diff --git a/xml/xml-frontback/src/com/intellij/lang/dtd/DTDLanguage.java b/xml/xml-parser/src/com/intellij/lang/dtd/DTDLanguage.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/lang/dtd/DTDLanguage.java
rename to xml/xml-parser/src/com/intellij/lang/dtd/DTDLanguage.java
diff --git a/xml/xml-frontback/src/com/intellij/lang/html/HTMLLanguage.java b/xml/xml-parser/src/com/intellij/lang/html/HTMLLanguage.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/lang/html/HTMLLanguage.java
rename to xml/xml-parser/src/com/intellij/lang/html/HTMLLanguage.java
diff --git a/xml/xml-frontback/src/com/intellij/lang/xhtml/XHTMLLanguage.java b/xml/xml-parser/src/com/intellij/lang/xhtml/XHTMLLanguage.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/lang/xhtml/XHTMLLanguage.java
rename to xml/xml-parser/src/com/intellij/lang/xhtml/XHTMLLanguage.java
diff --git a/xml/xml-frontback/src/com/intellij/lang/xml/XMLLanguage.java b/xml/xml-parser/src/com/intellij/lang/xml/XMLLanguage.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/lang/xml/XMLLanguage.java
rename to xml/xml-parser/src/com/intellij/lang/xml/XMLLanguage.java
diff --git a/xml/xml-frontback/src/com/intellij/lang/xml/XmlTokenElementMarkTypes.java b/xml/xml-parser/src/com/intellij/lang/xml/XmlTokenElementMarkTypes.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/lang/xml/XmlTokenElementMarkTypes.java
rename to xml/xml-parser/src/com/intellij/lang/xml/XmlTokenElementMarkTypes.java
diff --git a/xml/xml-frontback/src/com/intellij/openapi/editor/XmlHighlighterColors.java b/xml/xml-parser/src/com/intellij/openapi/editor/XmlHighlighterColors.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/openapi/editor/XmlHighlighterColors.java
rename to xml/xml-parser/src/com/intellij/openapi/editor/XmlHighlighterColors.java
diff --git a/xml/xml-frontback/src/com/intellij/psi/tree/xml/IXmlElementType.java b/xml/xml-parser/src/com/intellij/psi/tree/xml/IXmlElementType.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/psi/tree/xml/IXmlElementType.java
rename to xml/xml-parser/src/com/intellij/psi/tree/xml/IXmlElementType.java
diff --git a/xml/xml-frontback/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java b/xml/xml-parser/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java
rename to xml/xml-parser/src/com/intellij/psi/tree/xml/IXmlLeafElementType.java
diff --git a/xml/xml-frontback/src/com/intellij/psi/tree/xml/package.html b/xml/xml-parser/src/com/intellij/psi/tree/xml/package.html
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/psi/tree/xml/package.html
rename to xml/xml-parser/src/com/intellij/psi/tree/xml/package.html
diff --git a/xml/xml-frontback/src/com/intellij/psi/xml/XmlTokenType.java b/xml/xml-parser/src/com/intellij/psi/xml/XmlTokenType.java
similarity index 100%
rename from xml/xml-frontback/src/com/intellij/psi/xml/XmlTokenType.java
rename to xml/xml-parser/src/com/intellij/psi/xml/XmlTokenType.java
diff --git a/xml/xml-psi-api/intellij.xml.psi.iml b/xml/xml-psi-api/intellij.xml.psi.iml
index 7fa87c89bc49..3ccb5f1c3a38 100644
--- a/xml/xml-psi-api/intellij.xml.psi.iml
+++ b/xml/xml-psi-api/intellij.xml.psi.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
diff --git a/xml/xml-psi-impl/intellij.xml.psi.impl.iml b/xml/xml-psi-impl/intellij.xml.psi.impl.iml
index 94745d2252a0..f3f37d8c466b 100644
--- a/xml/xml-psi-impl/intellij.xml.psi.impl.iml
+++ b/xml/xml-psi-impl/intellij.xml.psi.impl.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="library" name="Xerces" level="project" />
diff --git a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
index fef3adba2f66..24cd6639c6de 100644
--- a/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
+++ b/xml/xml-structure-view-impl/intellij.xml.structureView.impl.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.structureView.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/xmlbeans/intellij.xml.xmlbeans.iml b/xml/xmlbeans/intellij.xml.xmlbeans.iml
index fa83b0f58b97..7ceaa0ddbd18 100644
--- a/xml/xmlbeans/intellij.xml.xmlbeans.iml
+++ b/xml/xmlbeans/intellij.xml.xmlbeans.iml
@@ -61,7 +61,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="module" module-name="intellij.xml.frontback" />
+    <orderEntry type="module" module-name="intellij.xml.parser" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />