diff --git a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
index 3fa16e8cd284..e975adab7da5 100644
--- a/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
+++ b/java/java-frontback-impl/resource/intellij.java.frontback.impl.xml
@@ -79,11 +79,11 @@
                  defaultValue="false"
                  description="Format chained calls as in versions prior to 2021.2"/>
 
-    <completion.frontendFriendlyInsertHandler implementationClass="com.intellij.codeInsight.completion.method.DiamondInsertHandler"/>
-    <completion.frontendFriendlyInsertHandler implementationClass="com.intellij.codeInsight.completion.method.RefStartInsertHandler"/>
-    <completion.frontendFriendlyInsertHandler implementationClass="com.intellij.codeInsight.completion.method.FrontendFriendlyParenthesesInsertHandler"/>
-    <completion.frontendFriendlyInsertHandler implementationClass="com.intellij.codeInsight.completion.method.MethodCallInstallerHandler"/>
-    <completion.frontendFriendlyInsertHandler implementationClass="com.intellij.codeInsight.completion.method.NegationInsertHandler"/>
+    <completion.frontendFriendlyInsertHandler handler="com.intellij.codeInsight.completion.method.DiamondInsertHandler"/>
+    <completion.frontendFriendlyInsertHandler handler="com.intellij.codeInsight.completion.method.RefStartInsertHandler"/>
+    <completion.frontendFriendlyInsertHandler handler="com.intellij.codeInsight.completion.method.FrontendFriendlyParenthesesInsertHandler"/>
+    <completion.frontendFriendlyInsertHandler handler="com.intellij.codeInsight.completion.method.MethodCallInstallerHandler"/>
+    <completion.frontendFriendlyInsertHandler handler="com.intellij.codeInsight.completion.method.NegationInsertHandler"/>
 
   </extensions>
 </idea-plugin>
diff --git a/java/java-frontback-impl/src/com/intellij/codeInsight/completion/method/FrontendFriendlyParenthesesInsertHandler.kt b/java/java-frontback-impl/src/com/intellij/codeInsight/completion/method/FrontendFriendlyParenthesesInsertHandler.kt
index 4661823c2671..b78dee320cde 100644
--- a/java/java-frontback-impl/src/com/intellij/codeInsight/completion/method/FrontendFriendlyParenthesesInsertHandler.kt
+++ b/java/java-frontback-impl/src/com/intellij/codeInsight/completion/method/FrontendFriendlyParenthesesInsertHandler.kt
@@ -8,7 +8,6 @@ import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.util.ThreeState
 import kotlinx.serialization.Serializable
 
-@Suppress("NonDefaultConstructor")
 @Serializable
 class FrontendFriendlyParenthesesInsertHandler(
   private val hasParameters: Boolean
diff --git a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
index c2717ea76583..8f6f7a115cbf 100644
--- a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
+++ b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
@@ -24,7 +24,7 @@
     <extensionPoint name="daemon.highlightInfoFilter" interface="com.intellij.codeInsight.daemon.impl.HighlightInfoFilter" dynamic="true"/>
     <extensionPoint name="daemon.intentionActionFilter" interface="com.intellij.codeInsight.daemon.impl.IntentionActionFilter" dynamic="true"/>
     <extensionPoint name="completion.frontendFriendlyInsertHandler" beanClass="com.intellij.codeInsight.completion.FrontendFriendlyInsertHandlerSerializerBean" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.FrontendFriendlyInsertHandler"/>
+      <with attribute="handler" implements="com.intellij.codeInsight.completion.FrontendFriendlyInsertHandler"/>
     </extensionPoint>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
@@ -95,8 +95,9 @@
     <daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.SyntheticPsiFileSupport$HighlightFilter"/>
     <daemon.intentionActionFilter implementation="com.intellij.codeInsight.daemon.SyntheticPsiFileSupport$IntentionFilter"/>
     <completion.frontendFriendlyInsertHandler
-      implementationClass="com.intellij.codeInsight.completion.CompositeFrontendFriendlyInsertHandler"/>
+      handler="com.intellij.codeInsight.completion.CompositeFrontendFriendlyInsertHandler"/>
+    <!--suppress KotlinObjectExtensionRegistration -->
     <completion.frontendFriendlyInsertHandler
-      implementationClass="com.intellij.codeInsight.completion.NoOpFrontendFriendlyInsertHandler"/>
+      handler="com.intellij.codeInsight.completion.NoOpFrontendFriendlyInsertHandler"/>
   </extensions>
 </idea-plugin>
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompositeFrontendFriendlyInsertHandler.kt b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompositeFrontendFriendlyInsertHandler.kt
index 7348a8a6736e..73d6a1560f6d 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompositeFrontendFriendlyInsertHandler.kt
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/CompositeFrontendFriendlyInsertHandler.kt
@@ -17,7 +17,6 @@ import org.jetbrains.annotations.ApiStatus
  *
  * @see FrontendFriendlyInsertHandler
  */
-@Suppress("NonDefaultConstructor")
 @ApiStatus.Internal
 @Serializable
 data class CompositeFrontendFriendlyInsertHandler(
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/completion/FrontendFriendlyInsertHandlerSerializer.kt b/platform/analysis-impl/src/com/intellij/codeInsight/completion/FrontendFriendlyInsertHandlerSerializer.kt
index 957c7d857878..521b451deb9e 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/completion/FrontendFriendlyInsertHandlerSerializer.kt
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/FrontendFriendlyInsertHandlerSerializer.kt
@@ -61,7 +61,7 @@ private fun <T : FrontendFriendlyInsertHandler> findSerializer(fqn: String): KSe
 private val ep_name = ExtensionPointName<FrontendFriendlyInsertHandlerSerializerBean>("com.intellij.completion.frontendFriendlyInsertHandler")
 
 internal class FrontendFriendlyInsertHandlerSerializerBean : BaseKeyedLazyInstance<KSerializer<Any>>(), KeyedLazyInstance<KSerializer<Any>> {
-  @Attribute("implementationClass")
+  @Attribute("handler")
   @RequiredElement
   @JvmField
   var implementationClass: String? = null