diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
index f73f78bf965..89d4d1d4083 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt
@@ -125,7 +125,7 @@ fun CFGNode<*>.render(): String =
         )
     }
 
-private object CfgRenderMode : FirRenderer.RenderMode(
+private val CfgRenderMode = FirRenderer.RenderMode(
     renderLambdaBodies = false,
     renderCallArguments = false,
     renderCallableFqNames = false,
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index c4a888e6d30..8a6d8d855ae 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -51,7 +51,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         )
     }
 
-    abstract class RenderMode(
+    data class RenderMode(
         val renderLambdaBodies: Boolean,
         val renderCallArguments: Boolean,
         val renderCallableFqNames: Boolean,
@@ -61,57 +61,59 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         val renderPropertyAccessors: Boolean = true,
         val renderDeclarationAttributes: Boolean = false,
     ) {
-        object Normal : RenderMode(
-            renderLambdaBodies = true,
-            renderCallArguments = true,
-            renderCallableFqNames = false,
-            renderDeclarationResolvePhase = false,
-            renderAnnotation = true,
-        )
+        companion object {
+            val Normal = RenderMode(
+                renderLambdaBodies = true,
+                renderCallArguments = true,
+                renderCallableFqNames = false,
+                renderDeclarationResolvePhase = false,
+                renderAnnotation = true,
+            )
 
-        object WithFqNames : RenderMode(
-            renderLambdaBodies = true,
-            renderCallArguments = true,
-            renderCallableFqNames = true,
-            renderDeclarationResolvePhase = false,
-            renderAnnotation = true,
-        )
+            val WithFqNames = RenderMode(
+                renderLambdaBodies = true,
+                renderCallArguments = true,
+                renderCallableFqNames = true,
+                renderDeclarationResolvePhase = false,
+                renderAnnotation = true,
+            )
 
-        object WithFqNamesExceptAnnotationAndBody : RenderMode(
-            renderLambdaBodies = true,
-            renderCallArguments = true,
-            renderCallableFqNames = true,
-            renderDeclarationResolvePhase = false,
-            renderAnnotation = false,
-            renderBodies = false,
-        )
+            val WithFqNamesExceptAnnotationAndBody = RenderMode(
+                renderLambdaBodies = true,
+                renderCallArguments = true,
+                renderCallableFqNames = true,
+                renderDeclarationResolvePhase = false,
+                renderAnnotation = false,
+                renderBodies = false,
+            )
 
-        object WithResolvePhases : RenderMode(
-            renderLambdaBodies = true,
-            renderCallArguments = true,
-            renderCallableFqNames = false,
-            renderDeclarationResolvePhase = true,
-            renderAnnotation = true,
-        )
+            val WithResolvePhases = RenderMode(
+                renderLambdaBodies = true,
+                renderCallArguments = true,
+                renderCallableFqNames = false,
+                renderDeclarationResolvePhase = true,
+                renderAnnotation = true,
+            )
 
-        object NoBodies : RenderMode(
-            renderLambdaBodies = false,
-            renderCallArguments = false,
-            renderCallableFqNames = false,
-            renderDeclarationResolvePhase = false,
-            renderAnnotation = false,
-            renderBodies = false,
-            renderPropertyAccessors = false,
-        )
+            val NoBodies = RenderMode(
+                renderLambdaBodies = false,
+                renderCallArguments = false,
+                renderCallableFqNames = false,
+                renderDeclarationResolvePhase = false,
+                renderAnnotation = false,
+                renderBodies = false,
+                renderPropertyAccessors = false,
+            )
 
-        object WithDeclarationAttributes : RenderMode(
-            renderLambdaBodies = true,
-            renderCallArguments = true,
-            renderCallableFqNames = false,
-            renderDeclarationResolvePhase = false,
-            renderAnnotation = true,
-            renderDeclarationAttributes = true,
-        )
+            val WithDeclarationAttributes = RenderMode(
+                renderLambdaBodies = true,
+                renderCallArguments = true,
+                renderCallableFqNames = false,
+                renderDeclarationResolvePhase = false,
+                renderAnnotation = true,
+                renderDeclarationAttributes = true,
+            )
+        }
     }
 
     private val printer = Printer(builder)