diff --git a/platform/analysis-api/resources/META-INF/analysis-api.xml b/platform/analysis-api/resources/META-INF/Analysis.xml
similarity index 100%
rename from platform/analysis-api/resources/META-INF/analysis-api.xml
rename to platform/analysis-api/resources/META-INF/Analysis.xml
diff --git a/platform/analysis-impl/resources/META-INF/analysis-impl.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
similarity index 100%
rename from platform/analysis-impl/resources/META-INF/analysis-impl.xml
rename to platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
diff --git a/platform/core-api/resources/META-INF/core-api.xml b/platform/core-api/resources/META-INF/Core.xml
similarity index 100%
rename from platform/core-api/resources/META-INF/core-api.xml
rename to platform/core-api/resources/META-INF/Core.xml
diff --git a/platform/core-impl/resources/META-INF/core-impl.xml b/platform/core-impl/resources/META-INF/CoreImpl.xml
similarity index 100%
rename from platform/core-impl/resources/META-INF/core-impl.xml
rename to platform/core-impl/resources/META-INF/CoreImpl.xml
diff --git a/platform/editor-ui-api/resources/META-INF/editor-ui-api.xml b/platform/editor-ui-api/resources/META-INF/Editor.xml
similarity index 100%
rename from platform/editor-ui-api/resources/META-INF/editor-ui-api.xml
rename to platform/editor-ui-api/resources/META-INF/Editor.xml
diff --git a/platform/editor-ui-ex/resources/META-INF/editor-ui-ex.xml b/platform/editor-ui-ex/resources/META-INF/EditorEx.xml
similarity index 100%
rename from platform/editor-ui-ex/resources/META-INF/editor-ui-ex.xml
rename to platform/editor-ui-ex/resources/META-INF/EditorEx.xml
diff --git a/platform/indexing-api/resources/META-INF/indexing-api.xml b/platform/indexing-api/resources/META-INF/Indexing.xml
similarity index 100%
rename from platform/indexing-api/resources/META-INF/indexing-api.xml
rename to platform/indexing-api/resources/META-INF/Indexing.xml
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 5969eb9fe2ca..5a89099b3fca 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -14,15 +14,15 @@
     <xi:fallback/>
   </xi:include>
 
-  <xi:include href="/META-INF/core-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/core-impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/analysis-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/analysis-impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/projectModel-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/projectModel-impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/indexing-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/editor-ui-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/editor-ui-ex.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/Core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/CoreImpl.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/Analysis.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/AnalysisImpl.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ProjectModel.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ProjectModelImpl.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/Indexing.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/Editor.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/EditorEx.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensionPoints>
     <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
diff --git a/platform/projectModel-api/resources/META-INF/projectModel-api.xml b/platform/projectModel-api/resources/META-INF/ProjectModel.xml
similarity index 100%
rename from platform/projectModel-api/resources/META-INF/projectModel-api.xml
rename to platform/projectModel-api/resources/META-INF/ProjectModel.xml
diff --git a/platform/projectModel-impl/resources/META-INF/projectModel-impl.xml b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
similarity index 100%
rename from platform/projectModel-impl/resources/META-INF/projectModel-impl.xml
rename to platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
diff --git a/python/python-psi-api/resources/META-INF/python-psi-api.xml b/python/python-psi-api/resources/META-INF/PythonPsi.xml
similarity index 100%
rename from python/python-psi-api/resources/META-INF/python-psi-api.xml
rename to python/python-psi-api/resources/META-INF/PythonPsi.xml
diff --git a/python/python-psi-impl/resources/META-INF/python-psi-impl.xml b/python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
similarity index 100%
rename from python/python-psi-impl/resources/META-INF/python-psi-impl.xml
rename to python/python-psi-impl/resources/META-INF/PythonPsiImpl.xml
diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 337ccc71eee8..f287837f600d 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -6,8 +6,8 @@
 
   <module value="com.intellij.modules.python"/>
 
-  <xi:include href="/META-INF/python-psi-api.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-psi-impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/PythonPsi.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/PythonPsiImpl.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <!-- Enable command-line language -->
   <xi:include href="/META-INF/command-line.xml" xpointer="xpointer(/idea-plugin/*)"/>