diff --git a/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension b/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
index 14bdc34d7c5..5da1cf79980 100644
--- a/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
+++ b/compiler/cli/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
@@ -1,5 +1,5 @@
 # Note that this file is also present in idea/src/META-INF/services
 org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm
 org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs
-org.jetbrains.kotlin.fir.analysis.diagnostics.DefaultErrorMessagesFir
+org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages
 org.jetbrains.kotlin.resolve.konan.diagnostics.DefaultErrorMessagesNative
\ No newline at end of file
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DefaultErrorMessagesFir.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
similarity index 98%
rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DefaultErrorMessagesFir.kt
rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
index 10a8a0b71df..b83f8a43935 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DefaultErrorMessagesFir.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
 
 @Suppress("unused")
-class DefaultErrorMessagesFir : DefaultErrorMessages.Extension {
+class FirDefaultErrorMessages : DefaultErrorMessages.Extension {
 
     override fun getMap(): DiagnosticFactoryToRendererMap {
         return MAP
diff --git a/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension b/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
index d009510a1c0..d40ff3ceb13 100644
--- a/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
+++ b/idea/resources/META-INF/services/org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages$Extension
@@ -1,5 +1,5 @@
 # Note that this file is also present in compiler/cli/src/META-INF/services
 org.jetbrains.kotlin.resolve.jvm.diagnostics.DefaultErrorMessagesJvm
 org.jetbrains.kotlin.js.resolve.diagnostics.DefaultErrorMessagesJs
-org.jetbrains.kotlin.fir.analysis.diagnostics.DefaultErrorMessagesFir
+org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages
 org.jetbrains.kotlin.resolve.konan.diagnostics.DefaultErrorMessagesNative
\ No newline at end of file