[kotlin] Migrate 'KtNamedSymbol' to 'KaNamedSymbol'

^KT-67996 GitOrigin-RevId: 402191cb01277385d7513eefd61262e3d7b9e44e
2026-01-06 03:21:12 +07:00 · 2024-06-06 03:53:15 +09:00
parent 8aec3c7a66
commit d8af065986
31 changed files with 74 additions and 74 deletions
--- a/plugins/devkit/intellij.kotlin.devkit/src/inspections/ForbiddenInSuspectContextMethodInspection.kt
+++ b/plugins/devkit/intellij.kotlin.devkit/src/inspections/ForbiddenInSuspectContextMethodInspection.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaClassOrObjectSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.types.KtUsualClassType
@@ -109,7 +109,7 @@ internal class ForbiddenInSuspectContextMethodInspection : LocalInspectionTool()
        val functionCall = expression.resolveCall()?.singleFunctionCallOrNull()
        val calledSymbol = functionCall?.partiallyAppliedSymbol?.symbol

-        if (calledSymbol !is KtNamedSymbol) return
+        if (calledSymbol !is KaNamedSymbol) return
        val hasAnnotation = calledSymbol.hasAnnotation(RequiresBlockingContextAnnotationId)

        if (!hasAnnotation) {
--- a/plugins/devkit/intellij.kotlin.devkit/src/inspections/KtCallingFunctionShouldBeRequiresBlockingContextVisitorProvider.kt
+++ b/plugins/devkit/intellij.kotlin.devkit/src/inspections/KtCallingFunctionShouldBeRequiresBlockingContextVisitorProvider.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.annotations.hasAnnotation
 import org.jetbrains.kotlin.analysis.api.calls.singleFunctionCallOrNull
 import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.util.addAnnotation
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtCallExpression
@@ -42,7 +42,7 @@ internal class KtCallingFunctionShouldBeRequiresBlockingContextVisitorProvider :
        val functionCall = expression.resolveCall()?.singleFunctionCallOrNull()
        val calledSymbol = functionCall?.partiallyAppliedSymbol?.symbol

-        if (calledSymbol !is KtNamedSymbol) return
+        if (calledSymbol !is KaNamedSymbol) return
        val hasAnnotation = calledSymbol.hasAnnotation(RequiresBlockingContextAnnotationId)

        if (!hasAnnotation) {
--- a/plugins/devkit/intellij.kotlin.devkit/src/inspections/UsePlatformProcessAwaitExitInspection.kt
+++ b/plugins/devkit/intellij.kotlin.devkit/src/inspections/UsePlatformProcessAwaitExitInspection.kt
@@ -11,7 +11,7 @@ import org.jetbrains.idea.devkit.kotlin.util.getContext
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.calls.singleFunctionCallOrNull
 import org.jetbrains.kotlin.analysis.api.calls.symbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtVisitorVoid
@@ -38,7 +38,7 @@ internal class UsePlatformProcessAwaitExitInspection : LocalInspectionTool() {
            val callNameExpression = expression.getCallNameExpression()?.text ?: return false
            if (isNotForbidden(callNameExpression)) return false // optimization to avoid resolving
            val calledSymbol = expression.resolveCall()?.singleFunctionCallOrNull()?.partiallyAppliedSymbol?.symbol
-            if (calledSymbol !is KtNamedSymbol) return false
+            if (calledSymbol !is KaNamedSymbol) return false
            val calledMethodName = calledSymbol.name.identifier
            if (isNotForbidden(calledMethodName)) return false
            if (calledSymbol.valueParameters.isNotEmpty()) return false
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/MakeOverriddenMemberOpenFix.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/MakeOverriddenMemberOpenFix.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaClassKind
 import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassOrObjectSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KaSymbolWithVisibility
 import org.jetbrains.kotlin.descriptors.Modality
@@ -70,7 +70,7 @@ private fun computeElementContext(element: KtNamedDeclaration): ElementContext?
        val overriddenMember = overriddenSymbol.psi
        val containingSymbol = overriddenSymbol.getContainingSymbol()
        if (overriddenMember == null || overriddenMember !is KtCallableDeclaration || !overriddenMember.canRefactorElement() ||
-            containingSymbol !is KtNamedSymbol || overriddenMember.modifierList?.hasModifier(KtTokens.OPEN_KEYWORD) == true
+            containingSymbol !is KaNamedSymbol || overriddenMember.modifierList?.hasModifier(KtTokens.OPEN_KEYWORD) == true
        ) {
            return null
        }
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SpecifyOverrideExplicitlyFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SpecifyOverrideExplicitlyFixFactory.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.declarations.modifiers.rendere
 import org.jetbrains.kotlin.analysis.api.renderer.declarations.renderers.callables.KaValueParameterSymbolRenderer
 import org.jetbrains.kotlin.analysis.api.symbols.KaConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinPsiUpdateModCommandAction
@@ -85,9 +85,9 @@ internal object SpecifyOverrideExplicitlyFixFactory {
        }

    context(KaSession)
-    private fun KtDelegatedSuperTypeEntry.getSymbol(): KtNamedSymbol? {
+    private fun KtDelegatedSuperTypeEntry.getSymbol(): KaNamedSymbol? {
        val nameReferenceExpression = delegateExpression as? KtNameReferenceExpression ?: return null
-        return nameReferenceExpression.mainReference.resolveToSymbol() as? KtNamedSymbol
+        return nameReferenceExpression.mainReference.resolveToSymbol() as? KaNamedSymbol
    }

    private val renderer = KtDeclarationRendererForSource.WITH_SHORT_NAMES.with {
--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithNullCheckFixFactory.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/SurroundWithNullCheckFixFactory.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.SmartPsiElementPointer
 import com.intellij.psi.createSmartPointer
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.codeinsight.api.applicable.intentions.KotlinPsiUpdateModCommandAction
 import org.jetbrains.kotlin.idea.codeinsight.api.applicators.fixes.KotlinQuickFixFactory
@@ -89,7 +89,7 @@ internal object SurroundWithNullCheckFixFactory {
        // Surround declaration (even of local variable) with null check is generally a bad idea
        if (expressionTarget is KtDeclaration) return emptyList()

-        val referenceSymbol = nullableExpression.mainReference.resolveToSymbol() as? KtNamedSymbol ?: return emptyList()
+        val referenceSymbol = nullableExpression.mainReference.resolveToSymbol() as? KaNamedSymbol ?: return emptyList()
        val file = expressionTarget.containingKtFile
        val scope = file.getScopeContextForPosition(expressionTarget).getCompositeScope()

--- a/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt
+++ b/plugins/kotlin/code-insight/fixes-k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/fixes/imprt/ImportQuickFix.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.declarations.KtDeclarationRend
 import org.jetbrains.kotlin.analysis.api.renderer.declarations.impl.KtDeclarationRendererForSource
 import org.jetbrains.kotlin.analysis.api.renderer.declarations.modifiers.renderers.KaRendererVisibilityModifierProvider
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtErrorType
 import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
 import org.jetbrains.kotlin.idea.actions.KotlinAddImportActionInfo.executeListener
@@ -360,7 +360,7 @@ class ImportQuickFix(

        context(KaSession)
        private fun KaDeclarationSymbol.getImportName(): String = buildString {
-            if (this@getImportName !is KtNamedSymbol) error("Unexpected anonymous declaration")
+            if (this@getImportName !is KaNamedSymbol) error("Unexpected anonymous declaration")

            if (this@getImportName is KaCallableSymbol) {
                val classSymbol = if (receiverType != null) receiverType?.expandedClassSymbol else originalContainingClassForOverride
--- a/plugins/kotlin/code-insight/inspections-shared/src/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RedundantLetInspection.kt
+++ b/plugins/kotlin/code-insight/inspections-shared/src/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RedundantLetInspection.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.api.calls.successfulFunctionCallOrNull
 import org.jetbrains.kotlin.analysis.api.calls.successfulVariableAccessCall
 import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.idea.base.psi.isMultiLine
 import org.jetbrains.kotlin.idea.base.psi.replaced
@@ -314,7 +314,7 @@ private fun KtFunctionLiteral.valueParameterReferences(callExpression: KtCallExp
        ?.entries
        ?.asSequence()
        ?.map { it.getSymbol() }
-        ?.filterIsInstance<KtNamedSymbol>()
+        ?.filterIsInstance<KaNamedSymbol>()
        ?.associateBy { it.name }
        ?: mapOf(valueParameterSymbol.name to valueParameterSymbol)

--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinDocumentationTarget.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.calls.successfulFunctionCallOrNull
 import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.elements.KtLightDeclaration
 import org.jetbrains.kotlin.builtins.StandardNames
@@ -196,7 +196,7 @@ private fun @receiver:Nls StringBuilder.renderEnumSpecialFunction(
        // element is not an KtReferenceExpression, but KtClass of enum
        // so reference extracted from originalElement
        analyze(referenceExpression) {
-            val symbol = referenceExpression.resolveCall()?.successfulFunctionCallOrNull()?.partiallyAppliedSymbol?.symbol as? KtNamedSymbol
+            val symbol = referenceExpression.resolveCall()?.successfulFunctionCallOrNull()?.partiallyAppliedSymbol?.symbol as? KaNamedSymbol
            val name = symbol?.name?.asString()
            if (name != null && symbol is KaDeclarationSymbol) {
                val containingClass = symbol.getContainingSymbol() as? KaClassOrObjectSymbol
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt
@@ -66,7 +66,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaTypeAliasSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaTypeParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KaSymbolWithVisibility
 import org.jetbrains.kotlin.analysis.api.types.*
 import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter
@@ -501,10 +501,10 @@ internal class KotlinIdeDeclarationRenderer(
                                }
                            }

-                            if (callableSymbol is KtNamedSymbol) {
+                            if (callableSymbol is KaNamedSymbol) {
                                declarationRenderer.nameRenderer.renderName(analysisSession, callableSymbol, declarationRenderer, printer)
                            } else if (callableSymbol is KaConstructorSymbol) {
-                                (callableSymbol.getContainingSymbol() as? KtNamedSymbol)?.let {
+                                (callableSymbol.getContainingSymbol() as? KaNamedSymbol)?.let {
                                    printer.append(highlight(it.name.renderName()) {
                                        asClassName
                                    })
@@ -661,7 +661,7 @@ internal class KotlinIdeDeclarationRenderer(
            override fun renderName(
                analysisSession: KaSession,
                name: Name,
-                symbol: KtNamedSymbol?,
+                symbol: KaNamedSymbol?,
                declarationRenderer: KtDeclarationRenderer,
                printer: PrettyPrinter
            ): Unit = with(analysisSession) {
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureElementPresentation.kt
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/structureView/KotlinFirStructureElementPresentation.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.declarations.superTypes.KaSupe
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaDeclarationSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KaSymbolPointer
 import org.jetbrains.kotlin.idea.base.codeInsight.KotlinIconProvider.getIconFor
 import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightBundle
@@ -179,7 +179,7 @@ internal class KotlinFirStructureElementPresentation(
                return null
            }
            
-            if (containingSymbol is KtNamedSymbol) {
+            if (containingSymbol is KaNamedSymbol) {
                return withRightArrow(containingSymbol.name.asString())
            }
        }
--- a/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtClassMember.kt
+++ b/plugins/kotlin/code-insight/override-implement-k2/src/org/jetbrains/kotlin/idea/core/overrideImplement/KtClassMember.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.declarations.impl.KtDeclaratio
 import org.jetbrains.kotlin.analysis.api.renderer.declarations.modifiers.renderers.KtRendererKeywordFilter
 import org.jetbrains.kotlin.analysis.api.renderer.declarations.modifiers.renderers.KtRendererOtherModifiersProvider
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMultiplatformSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KaSymbolPointer
 import org.jetbrains.kotlin.idea.base.util.names.FqNames.OptInFqNames.isRequiresOptInFqName
@@ -309,7 +309,7 @@ private fun generateProperty(

 private fun <T> KaSession.generateUnsupportedOrSuperCall(
    project: Project, symbol: T, bodyType: BodyType, canBeEmpty: Boolean = true
-): String where T : KtNamedSymbol, T : KaCallableSymbol {
+): String where T : KaNamedSymbol, T : KaCallableSymbol {
    when (bodyType.effectiveBodyType(canBeEmpty)) {
        BodyType.EmptyOrTemplate -> return ""
        BodyType.FromTemplate -> {
--- a/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt
+++ b/plugins/kotlin/code-insight/utils/src/org/jetbrains/kotlin/idea/codeinsight/utils/AddQualifiersUtil.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaClassLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.base.util.quoteIfNeeded
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -115,7 +115,7 @@ object AddQualifiersUtil {
        val fqName = allowAnalysisFromWriteAction {
            allowAnalysisOnEdt {
                analyze(referenceExpression) {
-                    val symbol = referenceExpression.mainReference.resolveToSymbols().singleOrNull() as? KtNamedSymbol ?: return null
+                    val symbol = referenceExpression.mainReference.resolveToSymbols().singleOrNull() as? KaNamedSymbol ?: return null
                    val fqName = getFqName(symbol) ?: return null
                    if (!isApplicableTo(referenceExpression, symbol)) return null
                    fqName
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirCompletionContributorBase.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirCompletionContributorBase.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.scopes.KtScopeNameFilter
 import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.idea.base.analysis.api.utils.KtSymbolFromIndexProvider
 import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange
@@ -71,7 +71,7 @@ internal abstract class FirCompletionContributorBase<C : KotlinRawPositionContex

    context(KaSession)
    protected fun addSymbolToCompletion(expectedType: KtType?, symbol: KtSymbol) {
-        if (symbol !is KtNamedSymbol) return
+        if (symbol !is KaNamedSymbol) return

        lookupElementFactory
            .createLookupElement(symbol, importStrategyDetector, expectedType = expectedType)
@@ -85,7 +85,7 @@ internal abstract class FirCompletionContributorBase<C : KotlinRawPositionContex
        symbolOrigin: CompletionSymbolOrigin,
        importingStrategy: ImportStrategy = importStrategyDetector.detectImportStrategyForClassifierSymbol(symbol),
    ) {
-        if (symbol !is KtNamedSymbol) return
+        if (symbol !is KaNamedSymbol) return

        val lookup = with(lookupElementFactory) {
            when (symbol) {
@@ -109,7 +109,7 @@ internal abstract class FirCompletionContributorBase<C : KotlinRawPositionContex
    ) {
        val symbol = signature.symbol
        val name = when (symbol) {
-            is KtNamedSymbol -> symbol.name
+            is KaNamedSymbol -> symbol.name
            is KaConstructorSymbol -> (symbol.getContainingSymbol() as? KaNamedClassOrObjectSymbol)?.name
            else -> null
        } ?: return
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirKDocParameterNameContributor.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirKDocParameterNameContributor.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassOrObjectSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaTypeParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.completion.FirCompletionSessionParameters
 import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
 import org.jetbrains.kotlin.idea.completion.contributors.helpers.CompletionSymbolOrigin
@@ -38,7 +38,7 @@ internal open class FirKDocParameterNameContributor(
        val ownerDeclarationSymbol = ownerDeclaration.getSymbol()

        getParametersForKDoc(ownerDeclarationSymbol)
-            .filter { (it.symbol as KtNamedSymbol).name.asString() !in alreadyDocumentedParameters }
+            .filter { (it.symbol as KaNamedSymbol).name.asString() !in alreadyDocumentedParameters }
            .forEach { addSymbolToCompletion(weighingContext, it) }
    }

--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirWhenWithSubjectConditionContributor.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/FirWhenWithSubjectConditionContributor.kt
@@ -12,7 +12,7 @@ import it.unimi.dsi.fastutil.Hash
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithTypeParameters
 import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
 import org.jetbrains.kotlin.analysis.api.types.KtType
@@ -112,7 +112,7 @@ internal class FirWhenWithSubjectConditionContributor(
        getAvailableClassifiersCurrentScope(originalKtFile, whenCondition, scopeNameFilter, visibilityChecker)
            .forEach { classifierWithScopeKind ->
                val classifier = classifierWithScopeKind.symbol
-                if (classifier !is KtNamedSymbol) return@forEach
+                if (classifier !is KaNamedSymbol) return@forEach
                availableFromScope += classifier

                addLookupElement(
@@ -128,7 +128,7 @@ internal class FirWhenWithSubjectConditionContributor(
        if (prefixMatcher.prefix.isNotEmpty()) {
            getAvailableClassifiersFromIndex(symbolFromIndexProvider, scopeNameFilter, visibilityChecker)
                .forEach { classifier ->
-                    if (classifier !is KtNamedSymbol || classifier in availableFromScope) return@forEach
+                    if (classifier !is KaNamedSymbol || classifier in availableFromScope) return@forEach

                    addLookupElement(
                        context,
@@ -143,12 +143,12 @@ internal class FirWhenWithSubjectConditionContributor(
    }

    context(KaSession)
-    private fun isPrefixNeeded(symbol: KtNamedSymbol): Boolean {
+    private fun isPrefixNeeded(symbol: KaNamedSymbol): Boolean {
        return when (symbol) {
            is KaAnonymousObjectSymbol -> return false
            is KaNamedClassOrObjectSymbol -> onTypingIsKeyword || !symbol.classKind.isObject
            is KaTypeAliasSymbol -> {
-                (symbol.expandedType as? KtNonErrorClassType)?.classSymbol?.let { it is KtNamedSymbol && isPrefixNeeded(it) } == true
+                (symbol.expandedType as? KtNonErrorClassType)?.classSymbol?.let { it is KaNamedSymbol && isPrefixNeeded(it) } == true
            }

            is KaTypeParameterSymbol -> true
@@ -270,7 +270,7 @@ internal class FirWhenWithSubjectConditionContributor(
    private fun addLookupElement(
        context: WeighingContext,
        lookupString: String,
-        symbol: KtNamedSymbol,
+        symbol: KaNamedSymbol,
        origin: CompletionSymbolOrigin,
        fqName: FqName?,
        isSingleCondition: Boolean,
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/ShadowedCallablesFilter.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/helpers/ShadowedCallablesFilter.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KaSymbolKind
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.idea.completion.checkers.ApplicableExtension
@@ -235,7 +235,7 @@ private sealed class SimplifiedSignature {
            typeArgumentsAreRequired: Boolean
        ): SimplifiedSignature? {
            val symbol = callableSignature.symbol
-            if (symbol !is KtNamedSymbol) return null
+            if (symbol !is KaNamedSymbol) return null

            val containerFqName = if (considerContainer) symbol.getContainerFqName() else null

--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/keywords/OverrideKeywordHandler.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/keywords/OverrideKeywordHandler.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.analysis.api.renderer.declarations.modifiers.rendere
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.idea.KtIconProvider.getBaseIcon
@@ -107,7 +107,7 @@ internal class OverrideKeywordHandler(
        val symbolPointer = member.memberInfo.symbolPointer
        val memberSymbol = symbolPointer.restoreSymbol()
        requireNotNull(memberSymbol) { "${symbolPointer::class} can't be restored" }
-        check(memberSymbol is KtNamedSymbol)
+        check(memberSymbol is KaNamedSymbol)
        check(classOrObject !is KtEnumEntry)

        val text = getSymbolTextForLookupElement(memberSymbol)
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/keywords/ThisKeywordHandler.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/contributors/keywords/ThisKeywordHandler.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaAnonymousFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaClassKind
 import org.jetbrains.kotlin.analysis.api.symbols.KaClassOrObjectSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.completion.lookups.CompletionShortNamesRenderer
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.Name
@@ -72,7 +72,7 @@ internal class ThisKeywordHandler(

    context(KaSession)
    private fun getThisLabelBySymbol(symbol: KtSymbol): Name? = when {
-        symbol is KtNamedSymbol && !symbol.name.isSpecial -> symbol.name
+        symbol is KaNamedSymbol && !symbol.name.isSpecial -> symbol.name
        symbol is KaAnonymousFunctionSymbol -> {
            val psi = symbol.psi as KtFunctionLiteral
            psi.findLabelAndCall().first
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/KotlinFirLookupElementFactory.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/lookups/factories/KotlinFirLookupElementFactory.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.idea.completion.impl.k2.ImportStrategyDetector
 import org.jetbrains.kotlin.idea.completion.impl.k2.lookups.factories.NamedArgumentLookupElementFactory
@@ -33,7 +33,7 @@ class KotlinFirLookupElementFactory {

    context(KaSession)
    fun createLookupElement(
-        symbol: KtNamedSymbol,
+        symbol: KaNamedSymbol,
        importStrategyDetector: ImportStrategyDetector,
        importingStrategy: ImportStrategy? = null,
        expectedType: KtType? = null,
@@ -90,7 +90,7 @@ class KotlinFirLookupElementFactory {
        symbol: KaClassLikeSymbol,
        importingStrategy: ImportStrategy,
    ): LookupElement? {
-        if (symbol !is KtNamedSymbol) return null
+        if (symbol !is KaNamedSymbol) return null
        return classLookupElementFactory.createLookup(symbol, importingStrategy)
    }
 }
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/weighers/PreferContextualCallablesWeigher.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/weighers/PreferContextualCallablesWeigher.kt
@@ -6,7 +6,7 @@ import com.intellij.codeInsight.lookup.LookupElementWeigher
 import com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.psi.NotNullableUserDataProperty

 /**
@@ -37,7 +37,7 @@ internal object PreferContextualCallablesWeigher {
     */
    context(KaSession)
    fun addWeight(lookupElement: LookupElement, symbol: KaCallableSymbol, contextualSymbolsCache: WeighingContext.ContextualSymbolsCache) {
-        if (symbol !is KtNamedSymbol || symbol.name !in contextualSymbolsCache) return
+        if (symbol !is KaNamedSymbol || symbol.name !in contextualSymbolsCache) return

        val symbolsToCheck = sequence {
            yield(symbol)
--- a/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/weighers/Weighers.kt
+++ b/plugins/kotlin/completion/impl-k2/src/org/jetbrains/kotlin/idea/completion/impl/k2/weighers/Weighers.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.symbols.KaCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.getSymbolOfType
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.idea.base.facet.platform.platform
@@ -55,7 +55,7 @@ internal class WeighingContext private constructor(
        private val contextualOverriddenSymbols: MutableMap<Name, Set<KaCallableSymbol>> = mutableMapOf()
        context(KaSession)
        fun symbolIsPresentInContext(symbol: KaCallableSymbol): Boolean = withValidityAssertion {
-            if (symbol !is KtNamedSymbol) return false
+            if (symbol !is KaNamedSymbol) return false

            val symbols = symbolsContainingPosition[symbol.name].orEmpty()
            if (symbol in symbols) return true
@@ -164,8 +164,8 @@ internal class WeighingContext private constructor(
                .parentsOfType<KtCallableDeclaration>()
                .filter { it !is KtParameter }
                .map { getOriginalDeclarationOrSelf(it, basicContext.originalKtFile).getSymbolOfType<KaCallableSymbol>() }
-                .filter { it is KtNamedSymbol }
-                .groupBy { (it as KtNamedSymbol).name }
+                .filter { it is KaNamedSymbol }
+                .groupBy { (it as KaNamedSymbol).name }
                .let { ContextualSymbolsCache(it) }
        }
    }
--- a/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTestMixIn.kt
+++ b/plugins/kotlin/fir/tests/test/org/jetbrains/kotlin/idea/fir/codeInsight/FirOverrideImplementTestMixIn.kt
@@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.fir.codeInsight
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
 import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTestMixIn
 import org.jetbrains.kotlin.idea.core.overrideImplement.AbstractGenerateMembersHandler
 import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
@@ -30,7 +30,7 @@ internal interface FirOverrideImplementTestMixIn : OverrideImplementTestMixIn<Kt
    @OptIn(KaAllowAnalysisOnEdt::class)
    override fun getMemberName(parentClass: KtClassOrObject, chooserObject: KtClassMember): String = allowAnalysisOnEdt {
        analyze(parentClass) {
-            (chooserObject.memberInfo.symbolPointer.restoreSymbol() as? KtNamedSymbol)?.name?.asString() ?: ""
+            (chooserObject.memberInfo.symbolPointer.restoreSymbol() as? KaNamedSymbol)?.name?.asString() ?: ""
        }
    }

--- a/plugins/kotlin/k2-fe10-bindings/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt
+++ b/plugins/kotlin/k2-fe10-bindings/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.analysis.api.base.KaConstantValue
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbolOrigin.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithTypeParameters
 import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
 import org.jetbrains.kotlin.analysis.api.types.KtType
@@ -49,7 +49,7 @@ internal fun Fe10WrapperContext.containerDeclarationImplementationPostponed(): N
    implementationPostponed("It isn't clear what we really need and how to implement it")

 interface KtSymbolBasedNamed : Named {
-    val ktSymbol: KtNamedSymbol
+    val ktSymbol: KaNamedSymbol
    override fun getName(): Name = ktSymbol.name
 }

--- a/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/inheritors/DirectKotlinClassInheritorsSearcher.kt
+++ b/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/inheritors/DirectKotlinClassInheritorsSearcher.kt
@@ -12,7 +12,7 @@ import com.intellij.util.Query
 import com.intellij.util.concurrency.annotations.RequiresReadLock
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.symbols.KaTypeAliasSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtUsualClassType
 import org.jetbrains.kotlin.idea.base.projectStructure.scope.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex
@@ -91,7 +91,7 @@ internal class DirectKotlinClassInheritorsSearcher : Searcher<DirectKotlinClassI
                analyze(ktClassOrObject) {
                    val baseSymbol = basePointer.restoreSymbol() ?: return false
                    val ktSymbol = ktClassOrObject.getClassOrObjectSymbol() ?: return false
-                    if (!parameters.includeAnonymous && ktSymbol !is KtNamedSymbol) {
+                    if (!parameters.includeAnonymous && ktSymbol !is KaNamedSymbol) {
                        return false
                    }

--- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/intentions/OperatorToFunctionConverter.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/intentions/OperatorToFunctionConverter.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisFromWriteAct
 import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
 import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisFromWriteAction
 import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.base.projectStructure.languageVersionSettings
 import org.jetbrains.kotlin.idea.base.psi.copied
@@ -158,7 +158,7 @@ object OperatorToFunctionConverter {
                val resolvedCall = element.resolveCall()?.singleFunctionCallOrNull()
                val targetSymbol = resolvedCall?.partiallyAppliedSymbol?.symbol

-                (targetSymbol as? KtNamedSymbol)?.name
+                (targetSymbol as? KaNamedSymbol)?.name
            }
        }
    }
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureFixFactory.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/quickFix/ChangeSignatureFixFactory.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.components.buildClassType
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.builtins.StandardNames.IMPLICIT_LAMBDA_PARAMETER_NAME
@@ -347,7 +347,7 @@ object ChangeSignatureFixFactory {
            containingSymbol.origin == KtSymbolOrigin.LIBRARY
        ) return emptyList()

-        val name = (symbol as? KtNamedSymbol)?.name?.asString() ?: return emptyList()
+        val name = (symbol as? KaNamedSymbol)?.name?.asString() ?: return emptyList()
        element.parentOfType<KtCallElement>(true) ?: return emptyList()

        val input = Input(
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/K2SemanticMatcher.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.calls.*
 import org.jetbrains.kotlin.analysis.api.fir.diagnostics.KaFirDiagnostic
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.types.KtTypeParameterType
 import org.jetbrains.kotlin.analysis.utils.errors.unexpectedElementError
@@ -215,14 +215,14 @@ object K2SemanticMatcher {
        fun areSymbolsEqualOrAssociated(targetSymbol: KtSymbol?, patternSymbol: KtSymbol?): Boolean {
            if (targetSymbol == null || patternSymbol == null) return targetSymbol == null && patternSymbol == null

-            if (patternSymbol is KtNamedSymbol) {
+            if (patternSymbol is KaNamedSymbol) {
                val patternElement = patternSymbol.psi as? PsiNamedElement
                if (patternElement != null && parameterSubstitution.containsKey(patternElement)) {
                    if (patternSymbol is KaCallableSymbol && targetSymbol is KaCallableSymbol) {
                        if (!targetSymbol.returnType.isSubTypeOf(patternSymbol.returnType)) return false
                    }
                    val expression =
-                        KtPsiFactory(patternElement.project).createExpression((targetSymbol as KtNamedSymbol).name.asString())
+                        KtPsiFactory(patternElement.project).createExpression((targetSymbol as KaNamedSymbol).name.asString())
                    val oldElement = parameterSubstitution.put(patternElement, expression)
                    return oldElement !is KtElement || oldElement.text == expression.text
                }
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/ConvertReferenceToLambdaUtil.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaNamedClassOrObjectSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtFunctionalType
 import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
 import org.jetbrains.kotlin.builtins.StandardNames
--- a/plugins/kotlin/refactorings/rename.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/rename/renameConflictUtils.kt
+++ b/plugins/kotlin/refactorings/rename.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/rename/renameConflictUtils.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.analyze
 import org.jetbrains.kotlin.analysis.api.calls.*
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtErrorType
 import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.conflicts.filterCandidates
@@ -267,7 +267,7 @@ private fun createQualifiedExpression(callExpression: KtExpression, newName: Str
                symbol.name!!.asString()
            } else if (symbol is KaClassifierSymbol && symbol !is KaAnonymousObjectSymbol) {
                "this@" + symbol.name!!.asString()
-            } else if (symbol is KaReceiverParameterSymbol && symbol.owningCallableSymbol is KtNamedSymbol) {
+            } else if (symbol is KaReceiverParameterSymbol && symbol.owningCallableSymbol is KaNamedSymbol) {
                receiverValue.type.expandedClassSymbol?.name?.let { "this@$it" } ?: "this"
            } else {
                "this"
--- a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode
 import org.jetbrains.kotlin.analysis.api.components.buildClassType
 import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType
 import org.jetbrains.kotlin.analysis.api.symbols.*
-import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.markers.KaNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.analysis.api.types.KtErrorType
 import org.jetbrains.kotlin.analysis.api.types.KtType
@@ -291,7 +291,7 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
    override fun resolvedFunctionName(ktCallElement: KtCallElement): String? {
        analyzeForUast(ktCallElement) {
            val resolvedFunctionLikeSymbol = ktCallElement.resolveCall()?.singleFunctionCallOrNull()?.symbol ?: return null
-            return (resolvedFunctionLikeSymbol as? KtNamedSymbol)?.name?.identifierOrNullIfSpecial
+            return (resolvedFunctionLikeSymbol as? KaNamedSymbol)?.name?.identifierOrNullIfSpecial
                ?: (resolvedFunctionLikeSymbol as? KaConstructorSymbol)?.let { SpecialNames.INIT.asString() }
        }
    }