diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
index f2226f47233..f163ad0c966 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -60,14 +60,14 @@ class FirCallResolver(
             file,
             transformer.container
         ) { it.resultType }
-        val resolver = CallResolver(
+        val towerResolver = FirTowerResolver(
             returnTypeCalculator, this, resolutionStageRunner,
             topLevelScopes = topLevelScopes.asReversed(),
             localScopes = localScopes.asReversed()
         )
 
-        val consumer = createFunctionConsumer(session, name, info, this, resolver.collector, resolver)
-        val result = resolver.runTowerResolver(consumer, implicitReceiverStack.receiversAsReversed())
+        val consumer = createFunctionConsumer(session, name, info, this, towerResolver.collector, towerResolver)
+        val result = towerResolver.runResolver(consumer, implicitReceiverStack.receiversAsReversed())
         val bestCandidates = result.bestCandidates()
         val reducedCandidates = if (result.currentApplicability < CandidateApplicability.SYNTHETIC_RESOLVED) {
             bestCandidates.toSet()
@@ -154,7 +154,7 @@ class FirCallResolver(
             file,
             transformer.container
         ) { it.resultType }
-        val resolver = CallResolver(
+        val towerResolver = FirTowerResolver(
             returnTypeCalculator, this, resolutionStageRunner,
             topLevelScopes = topLevelScopes.asReversed(),
             localScopes = localScopes.asReversed()
@@ -164,9 +164,9 @@ class FirCallResolver(
             session,
             callee.name,
             info, this,
-            resolver.collector
+            towerResolver.collector
         )
-        val result = resolver.runTowerResolver(consumer, implicitReceiverStack.receiversAsReversed())
+        val result = towerResolver.runResolver(consumer, implicitReceiverStack.receiversAsReversed())
 
         val candidates = result.bestCandidates()
         val nameReference = createResolvedNamedReference(
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
index 938b34d6cd4..43a61d77286 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateCollector.kt
@@ -69,7 +69,7 @@ open class CandidateCollector(
 // Collects properties that potentially could be invoke receivers, like 'propertyName()',
 // and initiates further invoke resolution by adding property-bound invoke consumers
 class InvokeReceiverCandidateCollector(
-    val callResolver: CallResolver,
+    val towerResolver: FirTowerResolver,
     val invokeCallInfo: CallInfo,
     components: BodyResolveComponents,
     val invokeConsumer: AccumulatingTowerDataConsumer,
@@ -91,7 +91,7 @@ class InvokeReceiverCandidateCollector(
                     )
                     dispatchReceiver = candidate.dispatchReceiverExpression()
                     extensionReceiver = candidate.extensionReceiverExpression()
-                    typeRef = callResolver.typeCalculator.tryCalculateReturnType(candidate.symbol.firUnsafe())
+                    typeRef = towerResolver.typeCalculator.tryCalculateReturnType(candidate.symbol.firUnsafe())
                 },
                 invokeCallInfo.arguments,
                 invokeCallInfo.isSafeCall,
@@ -105,7 +105,7 @@ class InvokeReceiverCandidateCollector(
             invokeConsumer.addConsumer(
                 createSimpleFunctionConsumer(
                     session, OperatorNameConventions.INVOKE,
-                    boundInvokeCallInfo, callResolver.components, callResolver.collector
+                    boundInvokeCallInfo, towerResolver.components, towerResolver.collector
                 )
             )
         }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConsumerFactories.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConsumerFactories.kt
index c5fffc03bf1..0154d525dd1 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConsumerFactories.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConsumerFactories.kt
@@ -61,7 +61,7 @@ fun createFunctionConsumer(
     callInfo: CallInfo,
     bodyResolveComponents: BodyResolveComponents,
     resultCollector: CandidateCollector,
-    callResolver: CallResolver
+    towerResolver: FirTowerResolver
 ): TowerDataConsumer {
     val varCallInfo = CallInfo(
         CallKind.VariableAccess,
@@ -92,7 +92,7 @@ fun createFunctionConsumer(
                 varCallInfo,
                 bodyResolveComponents,
                 InvokeReceiverCandidateCollector(
-                    callResolver,
+                    towerResolver,
                     invokeCallInfo = callInfo,
                     components = bodyResolveComponents,
                     invokeConsumer = this,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
similarity index 98%
rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
index 8cfbd1829c8..ec86ffc19b3 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirTowerResolver.kt
@@ -19,7 +19,7 @@ enum class TowerDataKind {
     TOWER_LEVEL
 }
 
-class CallResolver(
+class FirTowerResolver(
     val typeCalculator: ReturnTypeCalculator,
     val components: BodyResolveComponents,
     private val resolutionStageRunner: ResolutionStageRunner,
@@ -141,7 +141,7 @@ class CallResolver(
     private lateinit var towerDataConsumer: TowerDataConsumer
     private lateinit var implicitReceiverValues: List<ImplicitReceiverValue<*>>
 
-    fun runTowerResolver(consumer: TowerDataConsumer, implicitReceiverValues: List<ImplicitReceiverValue<*>>): CandidateCollector {
+    fun runResolver(consumer: TowerDataConsumer, implicitReceiverValues: List<ImplicitReceiverValue<*>>): CandidateCollector {
         this.implicitReceiverValues = implicitReceiverValues
         towerDataConsumer = consumer