diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
index 24ebccd57fd..9beed2476e6 100644
--- a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
+++ b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
@@ -62,7 +62,7 @@
                         interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
                         interface="com.intellij.refactoring.rename.RenameHandler"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension"
-                        interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"
+                        interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
     </extensionPoints>
 </idea-plugin>
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
index c6d52a7bcc5..ee7ad0d3706 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
@@ -15,8 +15,6 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSessionBase
 import org.jetbrains.kotlin.fir.FirSessionProvider
 import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService
-import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension
-import org.jetbrains.kotlin.fir.extensions.FirRegisteredExtension
 import org.jetbrains.kotlin.fir.java.deserialization.KotlinDeserializedJvmSymbolsProvider
 import org.jetbrains.kotlin.fir.resolve.FirProvider
 import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider
diff --git a/compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension b/compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
similarity index 100%
rename from compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension
rename to compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
diff --git a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/FirAllOpenComponentRegistrar.kt b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/FirAllOpenComponentRegistrar.kt
index 12c025bc1ea..0161e9d1496 100644
--- a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/FirAllOpenComponentRegistrar.kt
+++ b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/FirAllOpenComponentRegistrar.kt
@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlin.fir.allopen
 
-import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension
+import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 
-class FirAllOpenComponentRegistrar : FirExtensionRegistrarExtension() {
+class FirAllOpenComponentRegistrar : FirExtensionRegistrar() {
     override fun ExtensionRegistrarContext.configurePlugin() {
         +::AllOpenStatusTransformer
     }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrarExtension.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrar.kt
similarity index 84%
rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrarExtension.kt
rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrar.kt
index a4a77b8bcf4..bcd826797f8 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrarExtension.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrar.kt
@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.fir.extensions
 import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
 import org.jetbrains.kotlin.fir.FirSession
 
-abstract class FirExtensionRegistrarExtension {
-    companion object : ProjectExtensionDescriptor<FirExtensionRegistrarExtension>(
-        "org.jetbrains.kotlin.fir.frontendIrExtensionRegistrarExtension",
-        FirExtensionRegistrarExtension::class.java
+abstract class FirExtensionRegistrar {
+    companion object : ProjectExtensionDescriptor<FirExtensionRegistrar>(
+        "org.jetbrains.kotlin.fir.frontendIrExtension",
+        FirExtensionRegistrar::class.java
     )
 
     protected inner class ExtensionRegistrarContext {
@@ -36,6 +36,6 @@ abstract class FirExtensionRegistrarExtension {
     )
 }
 
-fun FirExtensionPointService.registerExtensions(extensions: FirExtensionRegistrarExtension.RegisteredExtensions) {
+fun FirExtensionPointService.registerExtensions(extensions: FirExtensionRegistrar.RegisteredExtensions) {
     registerExtensions(FirStatusTransformerExtension::class, extensions.statusTransformerExtensions)
 }
\ No newline at end of file