diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
index 411c53d339a..b0ef7baba3e 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt
@@ -31,6 +31,6 @@ FILE: annotated.kt
     }
     public? final? fun bar(two: Two): R|kotlin/Unit| {
         lval <destruct>: <implicit> = two#
-        @Ann() lval x: <implicit> = R|<local>/<destruct>|.component1()
-        @Ann() lval y: <implicit> = R|<local>/<destruct>|.component2()
+        @Ann() lval x: <implicit> = R|<local>/<destruct>|.component1#()
+        @Ann() lval y: <implicit> = R|<local>/<destruct>|.component2#()
     }
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
index 45629a37ef0..9ff7f163329 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt
@@ -31,9 +31,9 @@ FILE: destructuring.kt
     }
     public? final? fun foo(some: Some): R|kotlin/Unit| {
         lval <destruct>: <implicit> = some#
-        lvar x: <implicit> = R|<local>/<destruct>|.component1()
-        lvar y: <implicit> = R|<local>/<destruct>|.component2()
-        lvar z: String = R|<local>/<destruct>|.component3()
+        lvar x: <implicit> = R|<local>/<destruct>|.component1#()
+        lvar y: <implicit> = R|<local>/<destruct>|.component2#()
+        lvar z: String = R|<local>/<destruct>|.component3#()
         lval <unary>: <implicit> = x#
         x# = R|<local>/<unary>|.inc#()
         R|<local>/<unary>|
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
index ec7ef778478..2b2dcf716f2 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt
@@ -64,8 +64,8 @@ FILE: for.kt
         lval <iterator>: <implicit> = set#.iterator#()
         while(R|<local>/<iterator>|.hasNext#()) {
             lval <destruct>: <implicit> = R|<local>/<iterator>|.next#()
-            lval x: <implicit> = R|<local>/<destruct>|.component1()
-            lval y: <implicit> = R|<local>/<destruct>|.component2()
+            lval x: <implicit> = R|<local>/<destruct>|.component1#()
+            lval y: <implicit> = R|<local>/<destruct>|.component2#()
             println#(<strcat>(String(x = ), x#.toString#(), String( y = ), y#.toString#()))
         }
 
diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
index e2a128867b8..f1847a2f7c6 100644
--- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
+++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt
@@ -33,8 +33,8 @@ FILE: lambda.kt
         }
 
         use#(<L> = use@fun <implicit>.<anonymous>(<destruct>: <implicit>): <implicit> {
-            lval x: <implicit> = R|<local>/<destruct>|.component1()
-            lval y: <implicit> = R|<local>/<destruct>|.component2()
+            lval x: <implicit> = R|<local>/<destruct>|.component1#()
+            lval y: <implicit> = R|<local>/<destruct>|.component2#()
             x#.plus#(y#)
         }
         )
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 4927945bd69..4ed8b7dbac6 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -1027,9 +1027,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     }
 
     override fun visitComponentCall(componentCall: FirComponentCall) {
-        componentCall.annotations.renderAnnotations()
-        componentCall.explicitReceiver.accept(this)
-        print(".component${componentCall.componentIndex}()")
+        visitFunctionCall(componentCall)
     }
 
     override fun visitGetClassCall(getClassCall: FirGetClassCall) {