diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoriesInitializer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoriesInitializer.kt
deleted file mode 100644
index 6938aa3f098..00000000000
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoriesInitializer.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("PackageDirectoryMismatch")
-
-package org.jetbrains.kotlin.diagnostics
-
-/**
- * This methods should me in `org.jetbrains.kotlin.diagnostics` package
- *   because of `DiagnosticFactory.setName` is package private
- */
-fun DiagnosticFactory<*>.initializeName(name: String) {
-    this.name = name
-}
\ No newline at end of file
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
index 78b5e8ebacd..ed3b1332193 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.FirPsiSourceElement
 import org.jetbrains.kotlin.fir.FirSourceElement
 
 sealed class AbstractFirDiagnosticFactory<out E : FirSourceElement, D : FirDiagnostic<E>, P : PsiElement>(
-    override var name: String?,
+    override val name: String,
     override val severity: Severity,
     val positioningStrategy: SourceElementPositioningStrategy<P>,
 ) : DiagnosticFactory<D>(name, severity) {
diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.kt b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.kt
index 7891448b8c9..67812d8c334 100644
--- a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.kt
+++ b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticFactory.kt
@@ -9,9 +9,15 @@ import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer
 import java.lang.IllegalArgumentException
 
 abstract class DiagnosticFactory<D : UnboundDiagnostic> protected constructor(
-    open var name: String?,
+    private var _name: String?,
     open val severity: Severity
 ) {
+    open val name: String
+        get() = _name!!
+
+    fun initializeName(name: String) {
+        _name = name
+    }
 
     open var defaultRenderer: DiagnosticRenderer<D>? = null
 
@@ -29,7 +35,7 @@ abstract class DiagnosticFactory<D : UnboundDiagnostic> protected constructor(
     }
 
     override fun toString(): String {
-        return name ?: "<Anonymous DiagnosticFactory>"
+        return _name ?: "<Anonymous DiagnosticFactory>"
     }
 
     companion object {
@@ -45,4 +51,4 @@ abstract class DiagnosticFactory<D : UnboundDiagnostic> protected constructor(
             throw IllegalArgumentException("Factory mismatch: expected one of " + factories + " but was " + diagnostic.factory)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory0.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory0.kt
index 6bb1e03a087..bf25bf84035 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory0.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory0.kt
@@ -34,9 +34,8 @@ class DebugInfoDiagnosticFactory0 private constructor(
         return DebugInfoDiagnostic(expression, this)
     }
 
-    override var name: String?
+    override val name: String
         get() = "DEBUG_INFO_$privateName"
-        set(_) {}
 
     companion object {
         val SMARTCAST = DebugInfoDiagnosticFactory0("SMARTCAST", Severity.INFO)
@@ -51,4 +50,4 @@ class DebugInfoDiagnosticFactory0 private constructor(
         val MISSING_UNRESOLVED = DebugInfoDiagnosticFactory0("MISSING_UNRESOLVED")
         val DYNAMIC = DebugInfoDiagnosticFactory0("DYNAMIC", Severity.INFO)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory1.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory1.kt
index cc043207e38..fd12864470e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory1.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/DebugInfoDiagnosticFactory1.kt
@@ -21,9 +21,8 @@ class DebugInfoDiagnosticFactory1 : DiagnosticFactory1<PsiElement, String>,
     DebugInfoDiagnosticFactory {
     private val privateName: String
 
-    override var name: String?
+    override val name: String
         get() = "DEBUG_INFO_$privateName"
-        set(_) {}
 
     override val withExplicitDefinitionOnly: Boolean
 
@@ -85,4 +84,4 @@ class DebugInfoDiagnosticFactory1 : DiagnosticFactory1<PsiElement, String>,
             return DebugInfoDiagnosticFactory1(name, severity, withExplicitDefinitionOnly)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/SyntaxErrorDiagnosticFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/SyntaxErrorDiagnosticFactory.kt
index e547fd0ba12..b3db44beea7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/SyntaxErrorDiagnosticFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/factories/SyntaxErrorDiagnosticFactory.kt
@@ -10,9 +10,8 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Severity
 
 class SyntaxErrorDiagnosticFactory private constructor() : DiagnosticFactory<SyntaxErrorDiagnostic>(Severity.ERROR) {
-    override var name: String?
+    override val name: String
         get() = "SYNTAX"
-        set(_) {}
 
     companion object {
         val INSTANCE = SyntaxErrorDiagnosticFactory()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index 592ac5f4f16..821a05c031e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -1199,7 +1199,7 @@ public interface Errors {
                         Object value = field.get(null);
                         if (value instanceof DiagnosticFactory) {
                             DiagnosticFactory<?> factory = (DiagnosticFactory<?>)value;
-                            factory.setName(field.getName());
+                            factory.initializeName(field.getName());
 
                             factory.setDefaultRenderer((DiagnosticRenderer) diagnosticToRendererMap.get(factory));
                         }