diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/ImplementationPrinter.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/ImplementationPrinter.kt
index 1dbe3a2aab6..09f1d1e9693 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/ImplementationPrinter.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/printer/ImplementationPrinter.kt
@@ -72,7 +72,7 @@ internal class ImplementationPrinter(
                         && !element.typeName.endsWith("AnnotationsContainer")
             }.orEmpty()
 
-            val customCalls = fieldsWithoutDefault.filter { it.customInitializationCall != null }
+            val customCalls = fieldsInConstructor.filter { it.customInitializationCall != null }
             if (bindingCalls.isNotEmpty() || customCalls.isNotEmpty()) {
                 println()
                 println("init {")
diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementation.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementation.kt
index c813c58d3b6..575c7deceec 100644
--- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementation.kt
+++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementation.kt
@@ -70,9 +70,9 @@ abstract class AbstractImplementation<Implementation, Element, Field>(
 
     private fun withDefault(field: Field) = !field.isFinal && (field.defaultValueInImplementation != null || field.isLateinit)
 
-    val fieldsWithoutDefault by lazy { allFields.filterNot(::withDefault) }
+    val fieldsInConstructor by lazy { allFields.filterNot(::withDefault) }
 
-    val fieldsWithDefault by lazy { allFields.filter(::withDefault) }
+    val fieldsInBody by lazy { allFields.filter(::withDefault) }
 
     var requiresOptIn = false
 
diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementationPrinter.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementationPrinter.kt
index 7bc8135a8fb..38f44a24841 100644
--- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementationPrinter.kt
+++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/AbstractImplementationPrinter.kt
@@ -39,7 +39,7 @@ abstract class AbstractImplementationPrinter<Implementation, Element, Implementa
                     add(implementationOptInAnnotation)
                 }
 
-                for (field in implementation.fieldsWithoutDefault) {
+                for (field in implementation.fieldsInConstructor) {
                     field.optInAnnotation?.let {
                         add(it)
                     }
@@ -61,13 +61,13 @@ abstract class AbstractImplementationPrinter<Implementation, Element, Implementa
 
             val fieldPrinter = makeFieldPrinter(this)
 
-            if (!isInterface && !isAbstract && implementation.fieldsWithoutDefault.isNotEmpty()) {
+            if (!isInterface && !isAbstract && implementation.fieldsInConstructor.isNotEmpty()) {
                 if (implementation.isPublic) {
                     print(" @", implementationOptInAnnotation.render(), " constructor")
                 }
                 println("(")
                 withIndent {
-                    implementation.fieldsWithoutDefault.forEachIndexed { _, field ->
+                    implementation.fieldsInConstructor.forEachIndexed { _, field ->
                         if (field.isParameter) {
                             print(field.name, ": ", field.typeRef.render())
                             println(",")
@@ -90,7 +90,7 @@ abstract class AbstractImplementationPrinter<Implementation, Element, Implementa
                         fieldPrinter.printField(it, override = true, modality = Modality.ABSTRACT.takeIf { isAbstract })
                     }
                 } else {
-                    implementation.fieldsWithDefault.forEach {
+                    implementation.fieldsInBody.forEach {
                         fieldPrinter.printField(it, override = true)
                     }
                 }
diff --git a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Builder.kt b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Builder.kt
index bbdff9c065c..05ab9bc1406 100644
--- a/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Builder.kt
+++ b/generators/tree-generator-common/src/org/jetbrains/kotlin/generators/tree/Builder.kt
@@ -53,7 +53,7 @@ class LeafBuilder<BuilderField, Element, Implementation>(
     override val typeName: String
         get() = (implementation.name ?: implementation.element.typeName) + "Builder"
 
-    override val allFields: List<BuilderField> by lazy { implementation.fieldsWithoutDefault }
+    override val allFields: List<BuilderField> by lazy { implementation.fieldsInConstructor }
 
     override val uselessFields: List<BuilderField> by lazy {
         val fieldsFromParents = parents.flatMap { it.allFields }.distinct()