diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 2ed07e36870f..ae46f5995216 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -250,7 +250,7 @@
   <extensionPoint name="hectorComponentProvider" interface="com.intellij.openapi.editor.HectorComponentPanelsProvider" area="IDEA_PROJECT"/>
   <extensionPoint name="scopeTreeExpander" interface="com.intellij.ide.scopeView.ScopeTreeStructureExpander" area="IDEA_PROJECT"/>
 
-  <extensionPoint name="lang.elementManipulator" interface="com.intellij.openapi.fileTypes.ClassExtensionPoint"/>
+  <extensionPoint name="lang.elementManipulator" beanClass="com.intellij.openapi.fileTypes.ClassExtensionPoint"/>
   <extensionPoint name="fileContextProvider" interface="com.intellij.psi.FileContextProvider" area="IDEA_PROJECT"/>
   <extensionPoint name="psi.fileReferenceHelper" interface="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceHelper"/>
 
@@ -260,9 +260,9 @@
 
   <extensionPoint name="pom.declarationSearcher" interface="com.intellij.pom.PomDeclarationSearcher"/>
 
-  <extensionPoint name="statistician" interface="com.intellij.psi.statistics.StatisticsExtensionPoint"/>
-  <extensionPoint name="weigher" interface="com.intellij.psi.WeigherExtensionPoint"/>
-  <extensionPoint name="completion.contributor" interface="com.intellij.codeInsight.completion.CompletionContributorEP"/>
+  <extensionPoint name="statistician" beanClass="com.intellij.psi.statistics.StatisticsExtensionPoint"/>
+  <extensionPoint name="weigher" beanClass="com.intellij.psi.WeigherExtensionPoint"/>
+  <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP"/>
   <extensionPoint name="completion.skip" interface="com.intellij.codeInsight.completion.CompletionPreselectSkipper"/>
   <extensionPoint name="lookup.charFilter" interface="com.intellij.codeInsight.lookup.CharFilter"/>
   <extensionPoint name="lookup.actionProvider" interface="com.intellij.codeInsight.lookup.LookupActionProvider"/>
@@ -304,7 +304,7 @@
   <extensionPoint name="readWriteAccessDetector" interface="com.intellij.codeInsight.highlighting.ReadWriteAccessDetector"/>
 
   <extensionPoint name="scopeParserExtension" interface="com.intellij.psi.search.scope.packageSet.PackageSetParserExtension"/>
-  <extensionPoint name="referenceProviderType" interface="com.intellij.util.KeyedLazyInstanceEP"/>
+  <extensionPoint name="referenceProviderType" beanClass="com.intellij.util.KeyedLazyInstanceEP"/>
   <extensionPoint name="colorSettingsPage"
                   interface="com.intellij.openapi.options.colors.ColorSettingsPage"/>
 
@@ -343,7 +343,7 @@
   <extensionPoint name="codeInsight.lineMarkerProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
   <extensionPoint name="codeInsight.surroundWithRangeAdjuster" interface="com.intellij.codeInsight.generation.surroundWith.SurroundWithRangeAdjuster"/>
 
-  <extensionPoint name="lang.substitutor" interface="com.intellij.lang.LanguageExtensionPoint"/>
+  <extensionPoint name="lang.substitutor" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
 
   <extensionPoint name="createFromTemplateActionReplacer"
                   interface="com.intellij.ide.fileTemplates.CreateFromTemplateActionReplacer"/>
@@ -380,9 +380,9 @@
                   interface="com.intellij.openapi.roots.ui.configuration.ModuleConfigurationEditorProvider"
                   area="IDEA_MODULE"/>
 
-  <extensionPoint name="callHierarchyProvider" interface="com.intellij.lang.LanguageExtensionPoint"/>
-  <extensionPoint name="methodHierarchyProvider" interface="com.intellij.lang.LanguageExtensionPoint"/>
-  <extensionPoint name="typeHierarchyProvider" interface="com.intellij.lang.LanguageExtensionPoint"/>
+  <extensionPoint name="callHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+  <extensionPoint name="methodHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+  <extensionPoint name="typeHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
 
   <extensionPoint name="editorAppearanceConfigurable" interface="com.intellij.openapi.options.UnnamedConfigurable"/>
   <extensionPoint name="editorSmartKeysConfigurable" interface="com.intellij.openapi.options.UnnamedConfigurable"/>
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
index 2faa663043a6..9a0c7693a1ec 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
@@ -60,7 +60,7 @@
                   interface="com.intellij.projectImport.ProjectOpenProcessor"/>
 
   <extensionPoint name="codeInsight.linkHandler"
-                  interface="com.intellij.codeInsight.hint.TooltipLinkHandlerEP"/>
+                  beanClass="com.intellij.codeInsight.hint.TooltipLinkHandlerEP"/>
 
   <extensionPoint name="directoryProjectConfigurator"
                   interface="com.intellij.platform.DirectoryProjectConfigurator"/>
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index e0101e05f9db..18956c5299cb 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -38,7 +38,7 @@
 
     <extensionPoint name="positionManagerDelegate" interface="org.jetbrains.plugins.groovy.extensions.debugger.ScriptPositionManagerHelper"/>
     <extensionPoint name="compilerExtension" interface="org.jetbrains.plugins.groovy.compiler.GroovyCompilerExtension"/>
-    <extensionPoint name="scriptType" interface="org.jetbrains.plugins.groovy.extensions.GroovyScriptTypeEP"/>
+    <extensionPoint name="scriptType" beanClass="org.jetbrains.plugins.groovy.extensions.GroovyScriptTypeEP"/>
 
     <!-- Groovy DSL extension points -->
     <extensionPoint name="psiEnhancerCategory" interface="org.jetbrains.plugins.groovy.dsl.psi.PsiEnhancerCategory"/>
diff --git a/xml/dom-impl/src/META-INF/DomPlugin.xml b/xml/dom-impl/src/META-INF/DomPlugin.xml
index d4be4f6708f5..8d2f13e7ee10 100644
--- a/xml/dom-impl/src/META-INF/DomPlugin.xml
+++ b/xml/dom-impl/src/META-INF/DomPlugin.xml
@@ -4,10 +4,10 @@
                     interface="com.intellij.util.xml.DomFileDescription"/>
 
     <extensionPoint name="dom.implementation"
-                    interface="com.intellij.util.xml.impl.DomImplementationClassEP"/>
+                    beanClass="com.intellij.util.xml.impl.DomImplementationClassEP"/>
 
     <extensionPoint name="dom.extender"
-                    interface="com.intellij.util.xml.reflect.DomExtenderEP"/>
+                    beanClass="com.intellij.util.xml.reflect.DomExtenderEP"/>
 
     <extensionPoint name="dom.customAnnotationChecker"
                     interface="com.intellij.util.xml.highlighting.DomCustomAnnotationChecker"/>