diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeJavaModuleBasedSession.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeJavaModuleBasedSession.kt
index 1257368b4c4..faaf32ddce8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeJavaModuleBasedSession.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeJavaModuleBasedSession.kt
@@ -23,15 +23,14 @@ class FirIdeJavaModuleBasedSession(
     project: Project,
     moduleInfo: ModuleInfo,
     sessionProvider: FirProjectSessionProvider,
-    scope: GlobalSearchScope,
-    dependenciesProvider: FirSymbolProvider? = null
+    scope: GlobalSearchScope
 ) : FirModuleBasedSession(moduleInfo, sessionProvider) {
 
 
     init {
         registerComponent(
             FirProvider::class,
-            IdeFirProvider(project, scope, this)
+            FirIdeProvider(project, scope, this)
         )
         registerComponent(
             FirSymbolProvider::class,
@@ -39,7 +38,7 @@ class FirIdeJavaModuleBasedSession(
                 listOf(
                     firProvider,
                     JavaSymbolProvider(this, sessionProvider.project, scope),
-                    dependenciesProvider ?: FirDependenciesSymbolProviderImpl(this)
+                    FirDependenciesSymbolProviderImpl(this)
                 )
             ) as FirSymbolProvider
         )
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/IdeFirProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeProvider.kt
similarity index 99%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/IdeFirProvider.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeProvider.kt
index fe1714fb52f..7c72479bd42 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/IdeFirProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeProvider.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 
-class IdeFirProvider(
+class FirIdeProvider(
     val project: Project,
     val scope: GlobalSearchScope,
     val session: FirSession
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt
index fc0a5ce7e28..d93f832826d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt
@@ -83,7 +83,7 @@ fun KtCallableDeclaration.getOrBuildFir(
     val klassFqName = this.containingClassOrObject?.relativeFqName()
     val declName = this.nameAsSafeName
 
-    val firProvider = FirProvider.getInstance(session) as IdeFirProvider
+    val firProvider = FirProvider.getInstance(session) as FirIdeProvider
     val firFile = firProvider.getOrBuildFile(file)
     val firMemberSymbol = firFile.findCallableMember(firProvider, this, packageFqName, klassFqName, declName).symbol
     val firMemberDeclaration = firMemberSymbol.fir
@@ -106,7 +106,7 @@ fun KtClassOrObject.getOrBuildFir(
     val packageFqName = file.packageFqName
     val klassFqName = this.relativeFqName()
 
-    val firProvider = FirProvider.getInstance(session) as IdeFirProvider
+    val firProvider = FirProvider.getInstance(session) as FirIdeProvider
     val firFile = firProvider.getOrBuildFile(file)
     val firClass = firProvider.getFirClassifierByFqName(ClassId(packageFqName, klassFqName, false)) as FirRegularClass
     if (firClass.resolvePhase >= phase) {
@@ -118,9 +118,9 @@ fun KtClassOrObject.getOrBuildFir(
     return firClass
 }
 
-private fun KtFile.getOrBuildRawFirFile(state: FirModuleResolveState): Pair<IdeFirProvider, FirFile> {
+private fun KtFile.getOrBuildRawFirFile(state: FirModuleResolveState): Pair<FirIdeProvider, FirFile> {
     val session = state.getSession(this)
-    val firProvider = FirProvider.getInstance(session) as IdeFirProvider
+    val firProvider = FirProvider.getInstance(session) as FirIdeProvider
     return firProvider to firProvider.getOrBuildFile(this)
 }
 
@@ -157,7 +157,7 @@ fun KtFile.getOrBuildFirWithDiagnostics(state: FirModuleResolveState): FirFile {
 
 private fun FirDeclaration.runResolve(
     file: FirFile,
-    firProvider: IdeFirProvider,
+    firProvider: FirIdeProvider,
     toPhase: FirResolvePhase,
     state: FirModuleResolveState
 ) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt
index 0a76253b31d..92ce159d7cf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt
@@ -101,7 +101,7 @@ abstract class AbstractFirLazyResolveTest : KotlinLightCodeInsightFixtureTestCas
         for (file in files) {
             val psiFile = psiManager.findFile(file) as KtFile
             val session = resolveState.getSession(psiFile)
-            val firProvider = FirProvider.getInstance(session) as IdeFirProvider
+            val firProvider = FirProvider.getInstance(session) as FirIdeProvider
             val firFile = firProvider.getFile(psiFile) ?: continue
             KotlinTestUtils.assertEqualsToFile(File(expectedTxtPath(file)), firFile.render())
         }