diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolProviderByJavaPsi.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolProviderByJavaPsi.kt
index fe253ab23d4..6c38d47f12c 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolProviderByJavaPsi.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolProviderByJavaPsi.kt
@@ -40,7 +40,7 @@ internal class KtFirSymbolProviderByJavaPsi(
         val classSymbol = getNamedClassSymbol(containingClass) ?: return null
         return with(analysisSession) {
             classSymbol.getDeclaredMemberScope()
-                .getCallableSymbols { it == name }
+                .getCallableSymbols(name)
                 .firstOrNull { it.psi == callable }
         }
     }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
index 86a207675fd..b73c5dc3c7e 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
@@ -56,15 +56,15 @@ internal object KDocReferenceResolver {
             .dropLast(1)
             .fold(initialScope) { currentScope, fqNamePart ->
                 currentScope
-                    .getClassifierSymbols { it == fqNamePart }
+                    .getClassifierSymbols(fqNamePart)
                     .mapNotNull { (it as? KtSymbolWithMembers)?.getDeclaredMemberScope() }
                     .toList()
                     .asCompositeScope()
             }
 
         val shortName = fqName.shortName()
-        addAll(scope.getCallableSymbols { it == shortName })
-        addAll(scope.getClassifierSymbols { it == shortName })
+        addAll(scope.getCallableSymbols(shortName))
+        addAll(scope.getClassifierSymbols(shortName))
     }
 
     context(KtAnalysisSession)
@@ -122,7 +122,7 @@ internal object KDocReferenceResolver {
             else -> {
                 getClassOrObjectSymbolByClassId(classId)
                     ?.getDeclaredMemberScope()
-                    ?.getCallableSymbols { it == callableId.callableName }
+                    ?.getCallableSymbols(callableId.callableName)
                     ?.let(::addAll)
             }
         }
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/SymbolByFqName.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/SymbolByFqName.kt
index bf450cce05c..7b2f09e3c7c 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/SymbolByFqName.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/SymbolByFqName.kt
@@ -66,8 +66,7 @@ sealed class SymbolData {
                 val classSymbol =
                     getClassOrObjectSymbolByClassId(classId)
                         ?: error("Class $classId is not found")
-                classSymbol.getDeclaredMemberScope().getCallableSymbols()
-                    .filter { (it as? KtNamedSymbol)?.name == callableId.callableName }
+                classSymbol.getDeclaredMemberScope().getCallableSymbols(callableId.callableName)
                     .toList()
             }
             if (symbols.isEmpty()) {
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt
index 6beb2e82f7e..b2cf6836a74 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt
@@ -197,7 +197,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
         // Compiler will generate 'equals/hashCode/toString' for data class if they are not final.
         // We want to mimic that.
         val nonFinalFunctionsFromAny = classOrObjectSymbol.getMemberScope()
-            .getCallableSymbols { name -> name.isFromAny }
+            .getCallableSymbols(EQUALS, HASHCODE_NAME, TO_STRING)
             .filterIsInstance<KtFunctionSymbol>()
             .filterNot {
                 it.modality == Modality.FINAL || (it.getContainingSymbol() as? KtNamedClassOrObjectSymbol)?.modality == Modality.FINAL
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInlineClass.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInlineClass.kt
index 6e58ae5f92b..cb5ca562f90 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInlineClass.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInlineClass.kt
@@ -66,7 +66,7 @@ internal class SymbolLightClassForInlineClass : SymbolLightClassForClassOrObject
                 ?.singleOrNull()
 
             if (inlineClassParameterSymbol != null) {
-                val propertySymbol = declaredMemberScope.getCallableSymbols { it == inlineClassParameterSymbol.name }
+                val propertySymbol = declaredMemberScope.getCallableSymbols(inlineClassParameterSymbol.name)
                     .singleOrNull { it is KtPropertySymbol && it.isFromPrimaryConstructor } as? KtPropertySymbol
 
                 if (propertySymbol != null) {