diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
index 3c67a23befa..cb28106575e 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
@@ -30,15 +30,15 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
 
 class KotlinFirCompletionContributor : CompletionContributor() {
     init {
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), KotlinHighLevelApiContributor)
+        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), KotlinFirCompletionProvider)
     }
 }
 
-private object KotlinHighLevelApiContributor : CompletionProvider<CompletionParameters>() {
+private object KotlinFirCompletionProvider : CompletionProvider<CompletionParameters>() {
     override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
         if (shouldSuppressCompletion(parameters, result.prefixMatcher)) return
 
-        KotlinAvailableScopesCompletionContributor.collectCompletions(parameters, result)
+        KotlinAvailableScopesCompletionProvider.addCompletions(parameters, result)
     }
 
     private val AFTER_NUMBER_LITERAL = PsiJavaPatterns.psiElement().afterLeafSkipping(
@@ -64,8 +64,8 @@ private object KotlinHighLevelApiContributor : CompletionProvider<CompletionPara
     }
 }
 
-private object KotlinAvailableScopesCompletionContributor {
-    private val lookupElementFactory = HighLevelApiLookupElementFactory()
+private object KotlinAvailableScopesCompletionProvider {
+    private val lookupElementFactory = KotlinFirLookupElementFactory()
 
     fun getOriginalPosition(parameters: CompletionParameters, originalFile: KtFile): PsiElement {
         fun PsiElement.getPositionForExpressionFunctionBody(): PsiElement? {
@@ -97,7 +97,7 @@ private object KotlinAvailableScopesCompletionContributor {
     }
 
     @OptIn(InvalidWayOfUsingAnalysisSession::class)
-    fun collectCompletions(parameters: CompletionParameters, result: CompletionResultSet) {
+    fun addCompletions(parameters: CompletionParameters, result: CompletionResultSet) {
         val originalFile = parameters.originalFile as? KtFile ?: return
 
         val reference = (parameters.position.parent as? KtSimpleNameExpression)?.mainReference ?: return
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinSymbolIconProvider.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
similarity index 98%
rename from idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinSymbolIconProvider.kt
rename to idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
index 7250c3e246d..636c92ed317 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinSymbolIconProvider.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import javax.swing.Icon
 
-internal object KotlinSymbolIconProvider {
+internal object KotlinFirIconProvider {
     fun getIconFor(symbol: KtNamedSymbol): Icon? {
         if (symbol is KtFunctionSymbol) {
             val isAbstract = symbol.modality == KtCommonSymbolModality.ABSTRACT
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/HighLevelApiLookupElementFactory.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt
similarity index 98%
rename from idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/HighLevelApiLookupElementFactory.kt
rename to idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt
index 5af26d0b342..f27a2f0cc10 100644
--- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/HighLevelApiLookupElementFactory.kt
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtTypeArgumentList
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.renderer.render
 
-internal class HighLevelApiLookupElementFactory {
+internal class KotlinFirLookupElementFactory {
     private val classLookupElementFactory = ClassLookupElementFactory()
     private val variableLookupElementFactory = VariableLookupElementFactory()
     private val functionLookupElementFactory = FunctionLookupElementFactory()
@@ -41,7 +41,7 @@ internal class HighLevelApiLookupElementFactory {
 
         return elementBuilder
             .withPsiElement(symbol.psi) // TODO check if it is a heavy operation and should be postponed
-            .withIcon(KotlinSymbolIconProvider.getIconFor(symbol))
+            .withIcon(KotlinFirIconProvider.getIconFor(symbol))
     }
 }