From f283f2db43eb6b7942dde92661104d514e758bed Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 22 Jul 2020 16:40:14 +0300
Subject: [PATCH] [FIR] Improve diagnostic reporting & don't use error symbol
 for candidate if possible

Also introduce few new diagnostics:
- NONE_APPLICABLE more many inapplicable candidates
- HIDDEN for visible candidates
---
 .../testData/resolve/arguments/default.txt    |  8 +-
 .../arguments/defaultFromOverrides.txt        |  4 +-
 .../resolve/arguments/integerLiteralTypes.txt |  8 +-
 .../resolve/arguments/javaArrayVariance.txt   |  2 +-
 .../testData/resolve/arguments/lambda.txt     | 14 +--
 .../arguments/operatorsOverLiterals.txt       | 16 ++--
 .../testData/resolve/arguments/simple.txt     | 12 +--
 .../testData/resolve/arguments/vararg.txt     |  8 +-
 .../callResolution/errorCandidates.txt        |  2 +-
 .../resolve/cfg/flowFromInplaceLambda.dot     |  2 +-
 .../resolve/cfg/flowFromInplaceLambda.txt     |  2 +-
 .../testData/resolve/cfg/jumps.dot            |  2 +-
 .../testData/resolve/cfg/jumps.txt            |  2 +-
 .../resolve/delegatingConstructorCall.kt      |  4 +-
 .../diagnostics/upperBoundViolated.txt        |  4 +-
 .../CallBasedInExpressionGenerator.kt         |  4 +-
 .../CallBasedInExpressionGenerator.txt        |  6 +-
 .../testData/resolve/expresssions/access.kt   |  4 +-
 .../testData/resolve/expresssions/access.txt  |  4 +-
 .../resolve/expresssions/enumEntryUse.txt     |  2 +-
 .../expresssions/inference/typeParameters.txt |  2 +-
 .../inference/typeParameters2.txt             |  2 +-
 .../resolve/expresssions/nestedVisibility.kt  | 12 +--
 .../resolve/expresssions/nestedVisibility.txt | 12 +--
 .../resolve/expresssions/privateVisibility.kt | 20 ++--
 .../expresssions/privateVisibility.txt        | 18 ++--
 .../expresssions/protectedVisibility.kt       |  6 +-
 .../expresssions/protectedVisibility.txt      |  6 +-
 .../expresssions/syntheticSmartCast.txt       |  2 +-
 .../inference/nullableIntegerLiteralType.txt  |  4 +-
 .../inference/receiverWithCapturedType.txt    |  2 +-
 .../resolve/lambdaArgInScopeFunction.txt      |  4 +-
 .../resolve/lambdaPropertyTypeInference.txt   |  8 +-
 .../testData/resolve/nested/innerTypes.txt    |  6 +-
 .../testData/resolve/overrides/simple.kt      |  2 +-
 .../testData/resolve/overrides/simple.txt     |  2 +-
 .../overrides/supertypeGenericsComplex.txt    |  2 +-
 .../definitelyNotNullAndOriginalType.txt      |  2 +-
 .../genericSamInferenceFromExpectType.txt     |  2 +-
 .../realConstructorFunction.txt               |  6 +-
 .../resolve/samConversions/genericSam.txt     |  2 +-
 .../resolve/samConversions/kotlinSam.txt      |  8 +-
 .../notSamBecauseOfSupertype.txt              |  6 +-
 .../testData/resolve/sealedClass.kt           |  4 +-
 .../testData/resolve/smartcasts/bangbang.dot  |  6 +-
 .../testData/resolve/smartcasts/bangbang.txt  |  6 +-
 .../smartcasts/booleans/equalsToBoolean.dot   | 16 ++--
 .../smartcasts/booleans/equalsToBoolean.txt   | 16 ++--
 .../booleans/jumpFromRhsOfOperator.dot        | 12 +--
 .../booleans/jumpFromRhsOfOperator.txt        | 12 +--
 .../boundSmartcastsInBranches.dot             |  8 +-
 .../boundSmartcastsInBranches.txt             |  8 +-
 .../resolve/smartcasts/equalsAndIdentity.dot  |  8 +-
 .../resolve/smartcasts/equalsAndIdentity.txt  |  8 +-
 .../resolve/smartcasts/nullability.dot        | 68 +++++++-------
 .../resolve/smartcasts/nullability.kt         | 12 +--
 .../resolve/smartcasts/nullability.txt        | 56 +++++------
 .../resolve/smartcasts/orInWhenBranch.txt     |  8 +-
 .../safeCalls/safeCallAndEqualityToBool.dot   |  8 +-
 .../safeCalls/safeCallAndEqualityToBool.txt   |  8 +-
 .../smartcasts/safeCalls/safeCalls.dot        |  6 +-
 .../smartcasts/safeCalls/safeCalls.txt        |  6 +-
 .../variables/delayedAssignment.dot           |  2 +-
 .../variables/delayedAssignment.txt           |  2 +-
 .../variables/smartcastAfterReassignment.dot  |  2 +-
 .../variables/smartcastAfterReassignment.txt  |  2 +-
 .../visibility/singletonConstructors.kt       |  4 +-
 .../visibility/singletonConstructors.txt      |  6 +-
 .../callableReferences/companions.kt          |  4 +-
 .../callableReferences/companions.txt         |  4 +-
 ...llableReferencesAfterAllSimpleArguments.kt |  4 +-
 ...lableReferencesAfterAllSimpleArguments.txt |  4 +-
 .../callableReferences/implicitTypes.kt       |  2 +-
 .../callableReferences/implicitTypes.txt      |  4 +-
 .../fromLibrary/notIsNullOrEmpty.txt          |  2 +-
 .../good/returnsImplies/eqNotEq.txt           |  2 +-
 .../good/returnsImplies/receivers.txt         |  2 +-
 .../resolveWithStdlib/j+k/JavaVisibility2.kt  | 16 ++--
 .../resolveWithStdlib/j+k/JavaVisibility2.txt | 22 ++---
 .../j+k/KJKComplexHierarchyWithNested.txt     |  4 +-
 .../j+k/KotlinClassParameter.txt              |  2 +-
 .../j+k/KotlinClassParameterGeneric.txt       |  4 +-
 .../ErrorNodeDiagnosticCollectorComponent.kt  | 10 +-
 .../diagnostics/FirDefaultErrorMessages.kt    |  7 +-
 .../diagnostics/FirDiagnosticRenderers.kt     | 16 ++--
 .../fir/analysis/diagnostics/FirErrors.kt     |  4 +-
 .../jetbrains/kotlin/fir/dump/HtmlFirDump.kt  | 36 ++++---
 .../jetbrains/kotlin/fir/FirCallResolver.kt   | 46 +++++----
 .../kotlin/fir/resolve/calls/Candidate.kt     |  5 +
 .../resolve/calls/ResolutionStageRunner.kt    |  6 +-
 .../fir/resolve/calls/TypeArgumentMapping.kt  |  2 +-
 .../fir/resolve/diagnostics/FirDiagnostics.kt | 26 +++--
 .../fir/resolve/inference/FirCallCompleter.kt |  4 +-
 .../FirExpressionsResolveTransformer.kt       |  2 +-
 .../tests/BinaryCallsOnNullableValues.fir.kt  |  8 +-
 .../tests/ConstructorsOfPrimitives.fir.kt     |  4 +-
 ...tedGetSetPropertyDelegateConvention.fir.kt |  4 +-
 .../DeprecatedUnaryOperatorConventions.fir.kt |  2 +-
 .../diagnostics/tests/Nullability.fir.kt      |  8 +-
 .../tests/ObjectWithConstructor.fir.kt        |  6 +-
 .../tests/PackageInExpressionPosition.fir.kt  |  4 +-
 .../tests/PrivateFromOuterPackage.fir.kt      | 10 +-
 .../annotationRenderingInTypes.fir.kt         |  2 +-
 ...ityResolveWithVarargAndOperatorCall.fir.kt | 18 ----
 ...ibilityResolveWithVarargAndOperatorCall.kt |  1 +
 ...nstraintFromLHSWithCorrectDirection.fir.kt |  4 +-
 ...intFromLHSWithCorrectDirectionError.fir.kt |  2 +-
 ...expectedTypeAsSubtypeOfFunctionType.fir.kt |  2 +-
 .../function/extensionToSupertype.fir.kt      | 19 ----
 .../function/extensionToSupertype.kt          |  1 +
 .../noAmbiguityMemberVsTopLevel.fir.kt        |  4 +-
 .../generic/dependOnArgumentType.fir.kt       |  6 +-
 .../generic/explicitTypeArguments.fir.kt      |  2 +-
 .../generic/genericExtensionFunction.fir.kt   |  6 +-
 ...nericCallWithReferenceAgainstVararg.fir.kt |  4 +-
 ...renceAdaptationHasDependencyOnApi14.fir.kt |  4 +-
 ...ctionTypeOverloadWithWrongParameter.fir.kt |  4 +-
 .../resolve/kt35887_simple.fir.kt             |  2 +-
 ...leReferencesAfterAllSimpleArguments.fir.kt |  6 +-
 ...resolveTwoReferencesAgainstGenerics.fir.kt |  4 +-
 .../tests/checkArguments/SpreadVarargs.fir.kt |  4 +-
 .../checkArguments/overloadedFunction.fir.kt  |  8 +-
 .../classObjects/ClassObjectVisibility.fir.kt |  4 +-
 .../nestedClassInPrivateClassObject.fir.kt    |  4 +-
 .../lateinitWithErroneousDelegation.fir.kt    |  4 +-
 ...LoopWithExtensionIteratorOnNullable.fir.kt |  4 +-
 .../forLoopWithNullableRange.fir.kt           |  4 +-
 .../tests/dataFlow/IsExpression.fir.kt        |  4 +-
 .../namedFunAsLastExpressionInBlock.fir.kt    |  2 +-
 .../propertyDefferedType.fir.kt               |  2 +-
 .../delegatedProperty/thisInDelegate.fir.kt   |  2 +-
 .../delegatedProperty/twoGetMethods.fir.kt    |  2 +-
 .../checkDeparenthesizedType.fir.kt           |  2 +-
 .../withInvisibleSynthesized.fir.kt           |  8 +-
 .../enum/ConstructorCallFromOutside.fir.kt    |  2 +-
 .../tests/enum/inheritanceFromEnum.fir.kt     |  2 +-
 .../exposed/exceptionOnFakeInvisible.fir.kt   |  2 +-
 .../tests/extensions/kt1875.fir.kt            |  2 +-
 .../complexInference.fir.kt                   | 16 ++--
 .../noExpectedType.fir.kt                     |  8 +-
 .../redeclaration.fir.kt                      |  2 +-
 .../destructuringInLambdas/simple.fir.kt      |  4 +-
 .../unusedParameters.fir.kt                   |  4 +-
 .../implicitArguments/fromSuperClasses.fir.kt |  4 +-
 .../fromSuperClassesLocal.fir.kt              |  4 +-
 .../fromSuperClassesTransitive.fir.kt         |  2 +-
 ...rongNumberOfTypeArgumentsDiagnostic.fir.kt |  6 +-
 .../tests/imports/CheckJavaVisibility2.fir.kt | 16 ++--
 .../imports/ImportOverloadFunctions.fir.kt    |  8 +-
 .../tests/imports/ImportPrivateMember.fir.kt  |  4 +-
 .../imports/InaccessiblePrivateClass.fir.kt   |  2 +-
 .../PackageLocalClassNotImported.fir.kt       |  2 +-
 .../PackageLocalClassReferencedError.fir.kt   |  2 +-
 .../imports/PrivateClassNotImported.fir.kt    |  2 +-
 .../PrivateClassReferencedError.fir.kt        |  2 +-
 .../invisibleFakeReferenceInImport.fir.kt     |  4 +-
 ...pleteFunctionArgumentsOfNestedCalls.fir.kt |  8 --
 .../completeFunctionArgumentsOfNestedCalls.kt |  1 +
 .../tests/incompleteCode/kt2014.fir.kt        |  4 +-
 ...cannotCompleteResolveNoneApplicable.fir.kt |  2 +-
 .../captureFromNullableTypeVariable.fir.kt    |  6 +-
 .../captureFromTypeParameterUpperBound.fir.kt |  6 +-
 .../inference/capturedTypes/kt2872.fir.kt     |  4 +-
 .../completeInferenceIfManyFailed.fir.kt      |  4 +-
 .../postponedArgumentsAnalysis/basic.fir.kt   |  6 +-
 .../constraintOnFunctionLiteral.fir.kt        |  2 +-
 .../tests/inference/kt39220.fir.kt            |  8 +-
 .../inference/regressions/kt36342.fir.kt      | 12 +--
 .../tests/inference/regressions/kt742.fir.kt  |  2 +-
 ...renceWrongReceiverForManyCandidates.fir.kt |  4 +-
 .../tests/inference/tooEagerSmartcast.fir.kt  |  4 +-
 .../diagnostics/tests/inner/visibility.fir.kt | 12 +--
 ...isiblePackagePrivateInheritedMember.fir.kt |  2 +-
 .../tests/j+k/packageVisibility.fir.kt        | 16 ++--
 .../properties/fieldPropertyOverloads.fir.kt  |  8 +-
 .../fieldPropertyOverloadsDisabled.fir.kt     |  8 +-
 .../fieldPropertyOverloadsNI.fir.kt           |  8 +-
 ...privateCandidatesWithWrongArguments.fir.kt |  4 +-
 ...nceToSamFunctionAgainstExpectedType.fir.kt |  4 +-
 .../tests/j+k/selectMoreSpecific.fir.kt       |  4 +-
 ...ctionGenericsInParamsBoundsMismatch.fir.kt | 40 --------
 .../functionGenericsInParamsBoundsMismatch.kt |  1 +
 .../incompleteCodeNoNoneApplicable.fir.kt     |  2 +-
 .../tests/multimodule/internal.fir.kt         | 18 ++--
 .../tests/multimodule/packagePrivate.fir.kt   |  4 +-
 .../multimodule/publishedApiInternal.fir.kt   | 34 +++----
 .../enum/constructorInHeaderEnum.fir.kt       |  4 +-
 .../explicitConstructorDelegation.fir.kt      |  2 +-
 .../tests/multiplatform/namedArguments.fir.kt |  2 +-
 .../InfixCallNullability.fir.kt               |  4 +-
 .../NullableNothingIsExactlyNull.fir.kt       |  4 +-
 .../nullabilityAndSmartCasts/kt2216.fir.kt    |  2 +-
 .../nullabilityAndSmartCasts/kt362.fir.kt     |  4 +-
 ...ullableReceiverWithOverloadedMethod.fir.kt | 10 +-
 ...leSmartcastWithOverloadedExtensions.fir.kt |  4 +-
 ...eArgumentToNonNullParameterPlatform.fir.kt |  4 +-
 ...bleArgumentToNonNullParameterSimple.fir.kt |  6 +-
 .../deprecatedModConvention.fir.kt            |  6 +-
 ...precatedModConventionWithoutFeature.fir.kt |  6 +-
 .../InconsistentGetSet.fir.kt                 | 10 +-
 .../onlyPrivateOverloadsDiagnostic.fir.kt     |  4 +-
 .../override/AllPrivateFromSuperTypes.fir.kt  |  4 +-
 .../noAnnotationInClassPath.fir.kt            |  2 +-
 .../nullabilityWarnings/arithmetic.fir.kt     | 14 +--
 .../nullabilityWarnings/for.fir.kt            |  2 +-
 .../rawTypes/genericInnerClass.fir.kt         |  4 +-
 .../topLevelAnnotationCall.fir.kt             |  6 +-
 .../tests/privateInFile/visibility.fir.kt     | 12 +--
 .../tests/regressions/DoubleDefine.fir.kt     |  4 +-
 .../WrongTraceInCallResolver.fir.kt           |  2 +-
 .../tests/regressions/kt10633.fir.kt          |  2 +-
 .../tests/regressions/kt282.fir.kt            |  2 +-
 .../invoke/errors/invisibleInvoke.fir.kt      |  4 +-
 ...tionExpectedWhenSeveralInvokesExist.fir.kt |  4 +-
 .../invoke/implicitInvokeAfterSafeCall.fir.kt |  4 +-
 ...OnVariableWithExtensionFunctionType.fir.kt |  2 +-
 ...eInferenceForNestedInNoneApplicable.fir.kt |  4 +-
 ...nyInapplicableCandidatesWithLambdas.fir.kt | 28 +++---
 .../noCandidates/resolvedToClassifier.fir.kt  |  4 +-
 .../resolvedToClassifierWithReceiver.fir.kt   |  6 +-
 .../varargsInDifferentPositions.fir.kt        |  2 +-
 .../overloadConflicts/varargsMixed.fir.kt     |  4 +-
 .../specialConstructions/elvisAsCall.fir.kt   |  6 +-
 .../samConversions/OverloadPriority.fir.kt    |  6 +-
 .../samConversions/OverloadPriorityKT.fir.kt  |  6 +-
 .../arrayAsVarargAfterSamArgument.fir.kt      |  8 +-
 ...yAsVarargAfterSamArgumentProhibited.fir.kt |  8 +-
 ...entWithoutSamConversionsPerArgument.fir.kt |  8 +-
 .../scopes/VisibilityInClassObject.fir.kt     |  6 +-
 .../statics/hidePrivateByPublic.fir.kt        |  4 +-
 .../diagnostics/tests/scopes/kt1244.fir.kt    |  4 +-
 .../diagnostics/tests/scopes/kt1738.fir.kt    |  4 +-
 .../diagnostics/tests/scopes/kt1805.fir.kt    |  8 +-
 .../diagnostics/tests/scopes/kt1806.fir.kt    |  6 +-
 .../diagnostics/tests/scopes/kt1942.fir.kt    |  2 +-
 .../diagnostics/tests/scopes/kt37.fir.kt      |  4 +-
 .../diagnostics/tests/scopes/kt9430.fir.kt    |  4 +-
 .../innerProtectedClass.fir.kt                |  2 +-
 .../javaInheritedInKotlin.fir.kt              | 12 +--
 .../protectedCallOnSubClass.fir.kt            |  2 +-
 .../syntheticPropertyExtensions.fir.kt        |  2 +-
 .../syntheticSAMExtensions.fir.kt             |  2 +-
 .../tests/scopes/visibility.fir.kt            | 10 +-
 .../tests/scopes/visibility2.fir.kt           |  8 +-
 .../tests/scopes/visibility3.fir.kt           | 12 +--
 ...mentsResolveInBodyAndDelegationCall.fir.kt |  2 +-
 .../companionObjectScope.fir.kt               | 17 ----
 .../companionObjectScope.kt                   |  1 +
 .../constructorCallType.fir.kt                |  2 +-
 .../constructorInObject.fir.kt                |  4 +-
 .../errorsOnEmptyDelegationCall.fir.kt        | 10 +-
 .../superSecondaryNonExisting.fir.kt          |  4 +-
 .../thisNonExisting.fir.kt                    |  8 --
 .../secondaryConstructors/thisNonExisting.kt  |  1 +
 .../unstableSmartCast.fir.kt                  |  2 +-
 .../smartCasts/objectLiterals/exclexcl.fir.kt |  2 +-
 .../objectLiterals/exclexclArgument.fir.kt    |  2 +-
 .../objectLiterals/exclexclTwoArgument.fir.kt |  2 +-
 .../safecalls/nullableReceiver.fir.kt         |  4 +-
 .../nullableReceiverInLongChain.fir.kt        |  4 +-
 ...castOnSameFieldOfDifferentInstances.fir.kt |  2 +-
 .../varnotnull/plusplusMinusminus.fir.kt      |  6 +-
 .../varnotnull/unnecessaryWithMap.fir.kt      |  6 +-
 .../smartCasts/varnotnull/varIntNull.fir.kt   |  4 +-
 ...spendConversionForCallableReference.fir.kt |  2 +-
 ...ndConversionWithReferenceAdaptation.fir.kt |  2 +-
 .../javaProperties/OnlyPublic.fir.kt          |  8 +-
 .../SetterHasHigherAccess.fir.kt              |  8 +-
 .../samAdapters/PackageLocal.fir.kt           |  4 +-
 .../samAdapters/Private.fir.kt                |  4 +-
 .../samAdapters/Protected.fir.kt              |  2 +-
 .../samAdapters/overloadResolution.fir.kt     |  2 +-
 .../overloadResolutionStatic.fir.kt           |  2 +-
 ...dResolutionStaticWithoutRefinedSams.fir.kt |  2 +-
 ...verloadResolutionWithoutRefinedSams.fir.kt |  2 +-
 .../targetedBuiltIns/getOrDefault.fir.kt      |  8 +-
 .../tests/typealias/privateInFile.fir.kt      |  4 +-
 .../typealias/typeAliasConstructor.fir.kt     |  6 +-
 .../typeAliasConstructorWrongClass.fir.kt     |  4 +-
 ...typeAliasConstructorWrongVisibility.fir.kt |  6 +-
 .../chainedFunSuspendUnitConversion.fir.kt    |  2 +-
 .../chainedUnitSuspendConversion.fir.kt       |  2 +-
 ...entsInNamedFormFunDeprecation_after.fir.kt | 16 ++--
 ...ntsInNamedFormFunDeprecation_before.fir.kt | 16 ++--
 .../tests/varargs/varargViewedAsArray.fir.kt  | 12 +--
 .../privateToThis/FunctionCall.fir.kt         |  2 +-
 .../variance/privateToThis/GetVal.fir.kt      |  2 +-
 .../variance/privateToThis/SetVar.fir.kt      |  2 +-
 .../CallCompanionProtectedNonStatic.fir.kt    |  8 +-
 .../dsl/callUsualContractFunction.fir.kt      |  2 +-
 .../callableReferenceOnUnresolvedLHS.fir.kt   |  2 +-
 ...pendConversionForCallableReferences.fir.kt |  4 +-
 ...callableReferenceToASuspendFunction.fir.kt |  6 +-
 .../testsWithStdLib/coroutines/kt37309.fir.kt |  6 +-
 .../suspendExternalFunctions.fir.kt           |  4 +-
 .../coroutines/suspendFunctions.fir.kt        |  6 +-
 .../factoryPattern/multipleOverloads_1.fir.kt |  4 +-
 .../suspendFunctions.fir.kt                   |  2 +-
 .../testsWithStdLib/inference/kt11266.fir.kt  |  2 +-
 .../testsWithStdLib/inference/kt1558.fir.kt   |  4 +-
 .../resolve/samAgainstFunctionalType.fir.kt   |  4 +-
 .../resolve/samOverloadsWithGenerics.fir.kt   |  6 +-
 ...loadsWithGenericsWithoutRefinedSams.fir.kt |  6 +-
 .../resolve/samOverloadsWithKtFunction.fir.kt |  4 +-
 ...adsWithKtFunctionWithoutRefinedSams.fir.kt |  4 +-
 .../smartcasts/forEachUnsafe.fir.kt           |  2 +-
 .../unsupportedFeature.fir.kt                 |  2 +-
 .../typeAliasSamAdapterConstructors2.fir.kt   |  2 +-
 .../when/noTypeArgumentsInConstructor.fir.kt  | 10 +-
 .../adaptedWithCoercionToUnit.fir.txt         |  8 +-
 .../caoWithAdaptationForSam.fir.txt           | 72 +++++++++-----
 .../constructorWithAdaptedArguments.fir.txt   | 26 +++--
 .../suspendConversion.fir.txt                 |  4 +-
 ...emberReferenceWithAdaptedArguments.fir.txt | 14 ++-
 .../withAdaptationForSam.fir.txt              |  4 +-
 .../withAdaptedArguments.fir.txt              | 17 ++--
 .../withArgumentAdaptationAndReceiver.fir.txt | 25 ++---
 .../withVarargViewedAsArray.fir.txt           |  4 +-
 .../samConversionInVarargs.fir.txt            |  4 +-
 .../ir/irText/expressions/kt28456a.fir.txt    |  2 +-
 .../ir/irText/expressions/kt28456b.fir.txt    | 17 +++-
 .../ir/irText/expressions/lambdaInCAO.fir.txt | 24 +----
 .../sam/arrayAsVarargAfterSamArgument.fir.txt | 10 +-
 .../sam/arrayAsVarargAfterSamArgument.kt      |  2 +-
 .../sam/samByProjectedType.fir.txt            |  8 +-
 .../sam/samConversionsWithSmartCasts.fir.txt  |  4 +-
 .../signedToUnsignedConversions_test.fir.txt  | 14 +--
 ...endConversionOnArbitraryExpression.fir.txt | 30 +++---
 .../whenWithSubjectVariable.fir.txt           |  6 +-
 .../abstract-classes/p-2/neg/1.8.fir.kt       |  8 +-
 .../conditional-expression/p-6/neg/1.1.fir.kt |  4 +-
 .../boolean-literals/p-1/neg/3.1.fir.kt       | 12 +--
 .../p-1/neg/2.2.fir.kt                        | 12 +--
 .../p-1/neg/2.3.fir.kt                        | 94 +++++++++----------
 .../p-1/neg/2.4.fir.kt                        | 12 +--
 .../p-1/pos/2.2.fir.kt                        |  4 +-
 .../p-1/pos/2.3.fir.kt                        |  4 +-
 .../p-1/pos/2.4.fir.kt                        |  4 +-
 .../p-2/neg/1.1.fir.kt                        |  6 +-
 .../p-2/pos/1.1.fir.kt                        |  2 +-
 .../p-2/neg/1.1.fir.kt                        |  6 +-
 .../p-2/pos/1.1.fir.kt                        |  2 +-
 .../p-3/neg/1.1.fir.kt                        |  4 +-
 .../p-3/pos/1.4.fir.kt                        |  8 +-
 .../p-1/pos/1.1.fir.kt                        |  4 +-
 .../kotlin.nothing/p-1/neg/2.1.fir.kt         |  4 +-
 .../analysis/smartcasts/neg/1.fir.kt          | 24 ++---
 .../analysis/smartcasts/neg/10.fir.kt         | 12 +--
 .../analysis/smartcasts/neg/15.fir.kt         |  4 +-
 .../analysis/smartcasts/neg/4.fir.kt          | 16 ++--
 .../analysis/smartcasts/neg/6.fir.kt          | 20 ++--
 .../analysis/smartcasts/neg/7.fir.kt          |  4 +-
 .../analysis/smartcasts/neg/8.fir.kt          |  8 +-
 .../analysis/smartcasts/pos/1.fir.kt          | 10 +-
 .../analysis/smartcasts/pos/4.fir.kt          |  2 +-
 .../analysis/smartcasts/pos/6.fir.kt          | 20 ++--
 .../analysis/smartcasts/pos/8.fir.kt          |  4 +-
 .../diagnostics/notLinked/dfa/neg/1.fir.kt    | 88 ++++++++---------
 .../diagnostics/notLinked/dfa/neg/30.fir.kt   |  2 +-
 .../diagnostics/notLinked/dfa/neg/8.fir.kt    |  6 +-
 .../diagnostics/notLinked/dfa/pos/2.fir.kt    | 74 +++++++--------
 .../diagnostics/notLinked/dfa/pos/30.fir.kt   | 28 +++---
 .../diagnostics/notLinked/dfa/pos/31.fir.kt   | 24 ++---
 .../diagnostics/notLinked/dfa/pos/40.fir.kt   |  6 +-
 .../diagnostics/notLinked/dfa/pos/7.fir.kt    | 90 +++++++++---------
 365 files changed, 1400 insertions(+), 1451 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.fir.kt

diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/default.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/default.txt
index b8e5db76369..a009909f0e8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/default.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/default.txt
@@ -10,14 +10,14 @@ FILE: default.kt
         R|/foo|(Int(1), Double(2.0))
         R|/foo|(Int(1), Double(2.0), Boolean(true))
         R|/foo|(Int(1), third = Boolean(true))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#()
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(Int(0), Double(0.0), Boolean(false), String())
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#()
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#(Int(0), Double(0.0), Boolean(false), String())
         R|/bar|(Int(1), third = Boolean(true))
         R|/bar|(Int(1), Double(2.0), Boolean(true))
         R|/bar|(Int(1), Double(2.0), Boolean(true), String(my))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/bar]>#(Int(1), Boolean(true))
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /bar>#(Int(1), Boolean(true))
         R|/baz|(Int(1))
         R|/baz|(Int(1), vararg(String(my), String(yours)))
         R|/baz|(Int(1), z = Boolean(true))
-        <Inapplicable(INAPPLICABLE): [/baz]>#(Int(0), String(), Boolean(false))
+        <Inapplicable(INAPPLICABLE): /baz>#(Int(0), String(), Boolean(false))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt
index 572f865b1f3..c4baec92736 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt
@@ -22,8 +22,8 @@ FILE: defaultFromOverrides.kt
     public final fun foo(a: R|A|): R|kotlin/Unit| {
         R|<local>/a|.R|/A.foo|()
         R|<local>/a|.R|/A.foo|(Int(1))
-        R|<local>/a|.<Inapplicable(PARAMETER_MAPPING_ERROR): [/A.bar]>#()
-        R|<local>/a|.<Inapplicable(PARAMETER_MAPPING_ERROR): [/A.bar]>#(String())
+        R|<local>/a|.<Inapplicable(PARAMETER_MAPPING_ERROR): /A.bar>#()
+        R|<local>/a|.<Inapplicable(PARAMETER_MAPPING_ERROR): /A.bar>#(String())
         R|<local>/a|.R|/A.bar|(y = Int(1))
         R|<local>/a|.R|/A.bar|(String(), Int(2))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt
index 93573efd765..7e2036a595a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt
@@ -20,9 +20,9 @@ FILE: integerLiteralTypes.kt
         R|/takeLong|(Long(1))
     }
     public final fun test_2(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/takeInt]>#(Long(10000000000))
+        <Inapplicable(INAPPLICABLE): /takeInt>#(Long(10000000000))
         R|/takeLong|(Long(10000000000))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(1000))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(1000))
     }
     public final fun test_3(): R|kotlin/Unit| {
         R|/takeInt|(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
@@ -46,8 +46,8 @@ FILE: integerLiteralTypes.kt
         ))
     }
     public final fun test_5(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/takeString]>#(Int(1))
-        <Inapplicable(INAPPLICABLE): [/takeString]>#(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
+        <Inapplicable(INAPPLICABLE): /takeString>#(Int(1))
+        <Inapplicable(INAPPLICABLE): /takeString>#(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
             ^ Int(1)
         }
         ))
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt
index 38b33e16f27..da1cddf6a54 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt
@@ -5,6 +5,6 @@ FILE: main.kt
     }
     public final fun test(array: R|kotlin/Array<B>|): R|kotlin/Unit| {
         Q|A|.R|/A.take|(R|<local>/array|)
-        <Inapplicable(INAPPLICABLE): [/takeA]>#(R|<local>/array|)
+        <Inapplicable(INAPPLICABLE): /takeA>#(R|<local>/array|)
         R|/takeOutA|(R|<local>/array|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt
index 191b959464d..ef2642d0e31 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt
@@ -18,11 +18,11 @@ FILE: lambda.kt
             ^@foo Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(Int(1), <L> = foo@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#(Int(1), <L> = foo@fun <anonymous>(): R|kotlin/Unit| {
             ^@foo Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(f = foo@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#(f = foo@fun <anonymous>(): R|kotlin/Unit| {
             ^@foo Unit
         }
         , <L> = foo@fun <anonymous>(): R|kotlin/Unit| {
@@ -45,11 +45,11 @@ FILE: lambda.kt
             ^@bar Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/bar]>#(<L> = bar@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /bar>#(<L> = bar@fun <anonymous>(): R|kotlin/Unit| {
             ^@bar Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/bar]>#(bar@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /bar>#(bar@fun <anonymous>(): R|kotlin/Unit| {
             ^@bar Unit
         }
         )
@@ -61,15 +61,15 @@ FILE: lambda.kt
             ^@baz Unit
         }
         , Boolean(false))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/baz]>#(<L> = baz@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /baz>#(<L> = baz@fun <anonymous>(): R|kotlin/Unit| {
             ^@baz Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/baz]>#(<L> = baz@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /baz>#(<L> = baz@fun <anonymous>(): R|kotlin/Unit| {
             ^@baz Unit
         }
         )
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/baz]>#(other = Boolean(false), <L> = baz@fun <anonymous>(): R|kotlin/Unit| {
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /baz>#(other = Boolean(false), <L> = baz@fun <anonymous>(): R|kotlin/Unit| {
             ^@baz Unit
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt
index 7df6da04e07..fb21ec6c31b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt
@@ -30,20 +30,20 @@ FILE: operatorsOverLiterals.kt
     }
     public final fun test_4(): R|kotlin/Unit| {
         R|/takeByte|(Byte(1).R|kotlin/Byte.plus|(Byte(1)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(1).R|kotlin/Int.plus|(Int(127)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(1).R|kotlin/Int.plus|(Int(127)))
         R|/takeByte|(Byte(1).R|kotlin/Byte.minus|(Byte(1)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(100).R|kotlin/Int.unaryMinus|().R|kotlin/Int.minus|(Int(100)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(100).R|kotlin/Int.unaryMinus|().R|kotlin/Int.minus|(Int(100)))
         R|/takeByte|(Byte(10).R|kotlin/Byte.times|(Byte(10)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(100).R|kotlin/Int.times|(Int(100)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(100).R|kotlin/Int.times|(Int(100)))
         <Unresolved name: taleByte>#(Int(10).R|kotlin/Int.div|(Int(10)))
         R|/takeByte|(Byte(100).R|kotlin/Byte.rem|(Byte(10)))
         R|/takeByte|(Int(1000).R|kotlin/Int.rem|(Byte(10)))
         R|/takeByte|(Int(1000).R|<local>/and|(Byte(100)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(128).R|kotlin/Int.and|(Int(511)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(128).R|kotlin/Int.and|(Int(511)))
         R|/takeByte|(Byte(100).R|<local>/or|(Byte(100)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(1000).R|kotlin/Int.or|(Int(0)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(1000).R|kotlin/Int.or|(Int(0)))
         R|/takeByte|(Int(511).R|kotlin/Int.xor|(Int(511)))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(512).R|kotlin/Int.xor|(Int(511)))
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(512).R|kotlin/Int.xor|(Int(511)))
     }
     public final fun test_5(): R|kotlin/Unit| {
         R|/takeByte|(Byte(1).R|kotlin/Byte.unaryMinus|())
@@ -51,11 +51,11 @@ FILE: operatorsOverLiterals.kt
         R|/takeByte|(Byte(1).R|<local>/inv|())
     }
     public final fun test_6(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
+        <Inapplicable(INAPPLICABLE): /takeByte>#(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
             ^ Int(127).R|kotlin/Int.plus|(Int(1))
         }
         ))
-        <Inapplicable(INAPPLICABLE): [/takeByte]>#(Int(1).R|<local>/plus|(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
+        <Inapplicable(INAPPLICABLE): /takeByte>#(Int(1).R|<local>/plus|(R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
             ^ Int(1)
         }
         )))
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt
index ed1492ff5a4..83f3977e7d3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt
@@ -7,11 +7,11 @@ FILE: simple.kt
         R|/foo|(Int(1), Double(2.0), fourth = String(???), third = Boolean(false))
         R|/foo|(Int(1), second = Double(3.14), third = Boolean(false), fourth = String(!?))
         R|/foo|(third = Boolean(false), second = Double(2.71), fourth = String(?!), first = Int(0))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#()
-        <Inapplicable(INAPPLICABLE): [/foo]>#(Double(0.0), Boolean(false), Int(0), String())
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#()
+        <Inapplicable(INAPPLICABLE): /foo>#(Double(0.0), Boolean(false), Int(0), String())
         R|/foo|(Int(1), Double(2.0), third = Boolean(true), String())
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(second = Double(0.0), first = Int(0), fourth = String())
-        <Inapplicable(INAPPLICABLE): [/foo]>#(first = Double(0.0), second = Int(0), third = String(), fourth = Boolean(false))
-        <Inapplicable(INAPPLICABLE): [/foo]>#(first = Int(0), second = Double(0.0), third = Boolean(false), fourth = String(), first = Int(1))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/foo]>#(Int(0), Double(0.0), Boolean(false), foth = String())
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#(second = Double(0.0), first = Int(0), fourth = String())
+        <Inapplicable(INAPPLICABLE): /foo>#(first = Double(0.0), second = Int(0), third = String(), fourth = Boolean(false))
+        <Inapplicable(INAPPLICABLE): /foo>#(first = Int(0), second = Double(0.0), third = Boolean(false), fourth = String(), first = Int(1))
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /foo>#(Int(0), Double(0.0), Boolean(false), foth = String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt
index 0c1f2e2e558..192c7be531e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt
@@ -8,9 +8,9 @@ FILE: vararg.kt
         R|/foo|(Int(1), vararg(String()))
         R|/foo|(Int(1), vararg(String(my), String(yours)))
         R|/foo|(Int(1), vararg(*R|kotlin/arrayOf|<R|kotlin/String|>(vararg(String(my), String(yours)))))
-        <Inapplicable(INAPPLICABLE): [/foo]>#(String())
-        <Inapplicable(INAPPLICABLE): [/foo]>#(Int(1), Int(2))
+        <Inapplicable(INAPPLICABLE): /foo>#(String())
+        <Inapplicable(INAPPLICABLE): /foo>#(Int(1), Int(2))
         R|/bar|(Int(1), z = Boolean(true), vararg(y = *R|kotlin/arrayOf|<R|kotlin/String|>(vararg(String(my), String(yours)))))
-        <Inapplicable(INAPPLICABLE): [/bar]>#(Int(0), z = Boolean(false), y = String(), y = String(other))
-        <Inapplicable(PARAMETER_MAPPING_ERROR): [/bar]>#(Int(0), String(), Boolean(true))
+        <Inapplicable(INAPPLICABLE): /bar>#(Int(0), z = Boolean(false), y = String(), y = String(other))
+        <Inapplicable(PARAMETER_MAPPING_ERROR): /bar>#(Int(0), String(), Boolean(true))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt
index ca68824e1ad..123bc54e370 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt
@@ -12,7 +12,7 @@ FILE: errorCandidates.kt
     public final fun bar(x: R|B|): R|kotlin/Unit| {
     }
     public final fun test(c: R|C|): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/foo]>#(String())
+        <Inapplicable(INAPPLICABLE): /foo>#(String())
         <Ambiguity: bar, [/bar, /bar]>#(R|<local>/c|)
         <Unresolved name: baz>#()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
index 0727691f9c6..8e15644d748 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot
@@ -404,7 +404,7 @@ digraph flowFromInplaceLambda_kt {
             142 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
             143 [label="Variable declaration: lval a: R|kotlin/Int|"];
             144 [label="Access variable R|<local>/x|"];
-            145 [label="Function call: <Inapplicable(INAPPLICABLE): [/takeInt]>#(...)"];
+            145 [label="Function call: <Inapplicable(INAPPLICABLE): /takeInt>#(...)"];
             146 [label="Access variable R|<local>/y|"];
             147 [label="Function call: R|/takeInt|(...)"];
             148 [label="Access variable R|<local>/a|"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
index 6311423fb48..e0ca27481e1 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
@@ -63,7 +63,7 @@ FILE: flowFromInplaceLambda.kt
             ^ Int(1)
         }
         )))
-        <Inapplicable(INAPPLICABLE): [/takeInt]>#(R|<local>/x|)
+        <Inapplicable(INAPPLICABLE): /takeInt>#(R|<local>/x|)
         R|/takeInt|(R|<local>/y|)
         R|/takeInt|(R|<local>/a|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
index bb298f57985..0a6cb1c2a81 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot
@@ -127,7 +127,7 @@ digraph jumps_kt {
             }
             51 [label="Variable declaration: lval y: R|kotlin/Int?|"];
             52 [label="Access variable R|<local>/y|"];
-            53 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            53 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             54 [label="Exit block"];
         }
         55 [label="Exit function test_2" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
index e1af89bd0a7..43ca398ba28 100644
--- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
@@ -22,7 +22,7 @@ FILE: jumps.kt
             }
         }
 
-        R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/y|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
     }
     public final fun test_3(x: R|kotlin/Int?|): R|kotlin/Unit| {
         while(Boolean(true)) {
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.kt b/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.kt
index 0150e5633e3..f38568a6589 100644
--- a/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.kt
@@ -13,7 +13,7 @@ open class A3(x: String, y: String = "") {
 class B3_1 : <!AMBIGUITY!>A3<!>("")
 class B3_2 : A3("", "asas")
 class B3_3 : A3("", true)
-class B3_4 : <!INAPPLICABLE_CANDIDATE!>A3<!>("", Unit)
+class B3_4 : <!NONE_APPLICABLE!>A3<!>("", Unit)
 
 open class A4(val x: Byte)
 class B4 : A4( 1 + 1)
@@ -24,4 +24,4 @@ open class A5 {
 }
 
 class B5_1 : A5(1 + 1)
-class B5_2 : A5(100 * 2)
\ No newline at end of file
+class B5_2 : A5(100 * 2)
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt
index 65813044e15..e99de8fe0ed 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt
@@ -70,5 +70,5 @@ FILE: upperBoundViolated.kt
     }
     public final val np1: R|NumberPhile<kotlin/Int>| = R|/NumberPhile.NumberPhile|<R|kotlin/Int|>(Int(10))
         public get(): R|NumberPhile<kotlin/Int>|
-    public final val np2: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/NumberPhile.NumberPhile]> = <Inapplicable(INAPPLICABLE): [/NumberPhile.NumberPhile]>#(String(Test))
-        public get(): <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/NumberPhile.NumberPhile]>
+    public final val np2: R|NumberPhile<kotlin/String>| = <Inapplicable(INAPPLICABLE): /NumberPhile.NumberPhile>#<R|kotlin/String|>(String(Test))
+        public get(): R|NumberPhile<kotlin/String>|
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.kt
index 6754542d7a0..046f46615d0 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.kt
@@ -8,7 +8,7 @@ class CallBasedInExpressionGenerator(
     private val isInverted = operatorReference.<!UNRESOLVED_REFERENCE!>getReferencedNameElementType<!>() == <!UNRESOLVED_REFERENCE!>KtTokens<!>.<!UNRESOLVED_REFERENCE!>NOT_IN<!>
 
     override fun generate(argument: StackValue): BranchedValue =
-        gen(argument).<!INAPPLICABLE_CANDIDATE!>let<!> { if (isInverted) <!UNRESOLVED_REFERENCE!>Invert<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!UNRESOLVED_REFERENCE!>it<!> }
+        gen(argument).<!INAPPLICABLE_CANDIDATE!>let<!> { if (isInverted) <!UNRESOLVED_REFERENCE!>Invert<!>(it) else it }
 
     private fun gen(argument: StackValue): BranchedValue =
         object : BranchedValue(argument, null, argument.<!UNRESOLVED_REFERENCE!>type<!>, <!UNRESOLVED_REFERENCE!>Opcodes<!>.<!UNRESOLVED_REFERENCE!>IFEQ<!>) {
@@ -27,4 +27,4 @@ class CallBasedInExpressionGenerator(
                 result.<!UNRESOLVED_REFERENCE!>put<!>(result.<!UNRESOLVED_REFERENCE!>type<!>, result.<!UNRESOLVED_REFERENCE!>kotlinType<!>, v)
             }
         }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
index d39ed186e52..7ca63a42ccc 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
@@ -14,13 +14,13 @@ FILE: CallBasedInExpressionGenerator.kt
             private get(): R|kotlin/Boolean|
 
         public final override fun generate(argument: R|ERROR CLASS: Symbol not found, for `StackValue`|): R|ERROR CLASS: Symbol not found, for `BranchedValue`| {
-            ^generate this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.gen|(R|<local>/argument|).<Inapplicable(WRONG_RECEIVER): [kotlin/let]>#(<L> = let@fun <anonymous>(): <ERROR TYPE REF: Can't resolve when expression> {
+            ^generate this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.gen|(R|<local>/argument|).<Inapplicable(WRONG_RECEIVER): kotlin/let>#<R|kotlin/Any?|, R|kotlin/Nothing|>(<L> = let@fun <anonymous>(it: R|kotlin/Any?|): <ERROR TYPE REF: Can't resolve when expression> <kind=EXACTLY_ONCE>  {
                 ^ when () {
                     this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.isInverted| ->  {
-                        <Unresolved name: Invert>#(<Unresolved name: it>#)
+                        <Unresolved name: Invert>#(R|<local>/it|)
                     }
                     else ->  {
-                        <Unresolved name: it>#
+                        R|<local>/it|
                     }
                 }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/access.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/access.kt
index 21932a5d597..43487deca83 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/access.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/access.kt
@@ -21,7 +21,7 @@ class Bar {
     }
 
     // NB! abc() here is resolved to member Foo.abc(), and not to extension member of Bar
-    fun Foo.check() = abc() <!INAPPLICABLE_CANDIDATE!>+<!> bar()
+    fun Foo.check() = abc() <!NONE_APPLICABLE!>+<!> bar()
 
     // NB! + here is resolved to member String.plus (not to extension member above)
     fun Foo.check2() = "" + bar()
@@ -60,4 +60,4 @@ fun f() {
     <!UNRESOLVED_REFERENCE!>dcb<!>()
 
     abc()
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt
index a75324c9f5c..fa2f219769f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt
@@ -36,8 +36,8 @@ FILE: access.kt
             ^plus String()
         }
 
-        public final fun R|Foo|.check(): <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]> {
-            ^check this@R|/Bar.check|.R|/Foo.abc|().<Inapplicable(INAPPLICABLE): [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|/Bar|.R|/Bar.bar|())
+        public final fun R|Foo|.check(): <ERROR TYPE REF: Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]> {
+            ^check this@R|/Bar.check|.R|/Foo.abc|().<Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#(this@R|/Bar|.R|/Bar.bar|())
         }
 
         public final fun R|Foo|.check2(): R|kotlin/String| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt
index 03a2eeb9259..b9c71fe19c9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt
@@ -34,5 +34,5 @@ FILE: enumEntryUse.kt
         R|/useEnum|(Q|TestEnum|.R|/TestEnum.SECOND|)
         R|/useEnum|(Q|TestEnum|.R|/TestEnum.THIRD|)
         R|/useVararg|(vararg(Q|TestEnum|.R|/TestEnum.FIRST|, Q|TestEnum|.R|/TestEnum.SECOND|))
-        <Inapplicable(INAPPLICABLE): [/useVararg]>#(Int(1), Int(2), Int(3), Int(4), Int(5))
+        <Inapplicable(INAPPLICABLE): /useVararg>#(Int(1), Int(2), Int(3), Int(4), Int(5))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt
index aeec9b3958a..72def902fd6 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt
@@ -18,5 +18,5 @@ FILE: typeParameters.kt
     }
     public final fun main(fooImpl: R|FooImpl|, bar: R|Bar|): R|kotlin/Unit| {
         lval a: R|FooImpl| = R|/foo|<R|FooImpl|>(R|<local>/fooImpl|)
-        lval b: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/foo]> = <Inapplicable(INAPPLICABLE): [/foo]>#(R|<local>/bar|)
+        lval b: R|Bar| = <Inapplicable(INAPPLICABLE): /foo>#<R|Bar|>(R|<local>/bar|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt
index c3db7c75f76..0a968e9238f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt
@@ -17,6 +17,6 @@ FILE: typeParameters2.kt
         ^foo R|<local>/t|
     }
     public final fun main(fooImpl: R|FooImpl|, fooBarImpl: R|FooBarImpl|): R|kotlin/Unit| {
-        lval a: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/foo]> = <Inapplicable(INAPPLICABLE): [/foo]>#(R|<local>/fooBarImpl|)
+        lval a: R|FooImpl| = <Inapplicable(INAPPLICABLE): /foo>#<R|FooImpl|>(R|<local>/fooBarImpl|)
         lval b: R|Foo| = R|/foo|<R|Foo|>(R|<local>/fooImpl|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.kt
index 9f77c959bb3..73ed9de9800 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.kt
@@ -11,8 +11,8 @@ open class Outer {
 
 class Derived : Outer() {
     fun foo() {
-        Outer.<!INAPPLICABLE_CANDIDATE!>PrivateNested<!>()
-        super.<!INAPPLICABLE_CANDIDATE!>PrivateInner<!>()
+        Outer.<!HIDDEN!>PrivateNested<!>()
+        super.<!HIDDEN!>PrivateInner<!>()
 
         Outer.ProtectedNested()
         super.ProtectedInner()
@@ -23,11 +23,11 @@ class Derived : Outer() {
 }
 
 fun foo() {
-    Outer.<!INAPPLICABLE_CANDIDATE!>PrivateNested<!>()
-    Outer().<!INAPPLICABLE_CANDIDATE!>PrivateInner<!>()
+    Outer.<!HIDDEN!>PrivateNested<!>()
+    Outer().<!HIDDEN!>PrivateInner<!>()
 
-    Outer.<!INAPPLICABLE_CANDIDATE!>ProtectedNested<!>()
-    Outer().<!INAPPLICABLE_CANDIDATE!>ProtectedInner<!>()
+    Outer.<!HIDDEN!>ProtectedNested<!>()
+    Outer().<!HIDDEN!>ProtectedInner<!>()
 
     Outer.PublicNested()
     Outer().PublicInner()
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt
index 81b2fb57feb..f49ada227b3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt
@@ -53,8 +53,8 @@ FILE: nestedVisibility.kt
         }
 
         public final fun foo(): R|kotlin/Unit| {
-            Q|Outer|.<Inapplicable(HIDDEN): [/Outer.PrivateNested.PrivateNested]>#()
-            this@R|/Derived|.super<R|Outer|>.<Inapplicable(HIDDEN): [/Outer.PrivateInner.PrivateInner]>#()
+            Q|Outer|.<HIDDEN: /Outer.PrivateNested.PrivateNested is invisible>#()
+            this@R|/Derived|.super<R|Outer|>.<HIDDEN: /Outer.PrivateInner.PrivateInner is invisible>#()
             Q|Outer|.R|/Outer.ProtectedNested.ProtectedNested|()
             this@R|/Derived|.super<R|Outer|>.R|/Outer.ProtectedInner.ProtectedInner|()
             Q|Outer|.R|/Outer.PublicNested.PublicNested|()
@@ -63,10 +63,10 @@ FILE: nestedVisibility.kt
 
     }
     public final fun foo(): R|kotlin/Unit| {
-        Q|Outer|.<Inapplicable(HIDDEN): [/Outer.PrivateNested.PrivateNested]>#()
-        R|/Outer.Outer|().<Inapplicable(HIDDEN): [/Outer.PrivateInner.PrivateInner]>#()
-        Q|Outer|.<Inapplicable(HIDDEN): [/Outer.ProtectedNested.ProtectedNested]>#()
-        R|/Outer.Outer|().<Inapplicable(HIDDEN): [/Outer.ProtectedInner.ProtectedInner]>#()
+        Q|Outer|.<HIDDEN: /Outer.PrivateNested.PrivateNested is invisible>#()
+        R|/Outer.Outer|().<HIDDEN: /Outer.PrivateInner.PrivateInner is invisible>#()
+        Q|Outer|.<HIDDEN: /Outer.ProtectedNested.ProtectedNested is invisible>#()
+        R|/Outer.Outer|().<HIDDEN: /Outer.ProtectedInner.ProtectedInner is invisible>#()
         Q|Outer|.R|/Outer.PublicNested.PublicNested|()
         R|/Outer.Outer|().R|/Outer.PublicInner.PublicInner|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.kt
index bf2d0883ee5..a7a9a682290 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.kt
@@ -9,21 +9,21 @@ private class Private {
         bar()
         Nested()
         fromCompanion()
-        NotCompanion.<!INAPPLICABLE_CANDIDATE!>foo<!>() // hidden
+        NotCompanion.<!HIDDEN!>foo<!>() // hidden
     }
 
     inner class Inner {
         fun foo() {
             bar()
             fromCompanion()
-            NotCompanion.<!INAPPLICABLE_CANDIDATE!>foo<!>() // hidden
+            NotCompanion.<!HIDDEN!>foo<!>() // hidden
         }
     }
 
     private class Nested {
         fun foo() {
             fromCompanion()
-            NotCompanion.<!INAPPLICABLE_CANDIDATE!>foo<!>() // hidden
+            NotCompanion.<!HIDDEN!>foo<!>() // hidden
         }
     }
 
@@ -54,7 +54,7 @@ fun withLocals() {
 
     Local().baz()
 
-    Local().<!INAPPLICABLE_CANDIDATE!>bar<!>() // hidden
+    Local().<!HIDDEN!>bar<!>() // hidden
 }
 
 fun test() {
@@ -62,14 +62,14 @@ fun test() {
     Private().baz()
     Private().Inner()
 
-    Private().<!INAPPLICABLE_CANDIDATE!>bar<!>() // hidden
-    Private.<!INAPPLICABLE_CANDIDATE!>Nested<!>() // hidden
-    Private.<!INAPPLICABLE_CANDIDATE!>fromCompanion<!>() // hidden
+    Private().<!HIDDEN!>bar<!>() // hidden
+    Private.<!HIDDEN!>Nested<!>() // hidden
+    Private.<!HIDDEN!>fromCompanion<!>() // hidden
 }
 
 // FILE: second.kt
 
 fun secondTest() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>() // hidden
-    <!INAPPLICABLE_CANDIDATE!>Private<!>() // hidden
-}
\ No newline at end of file
+    <!HIDDEN!>foo<!>() // hidden
+    <!HIDDEN!>Private<!>() // hidden
+}
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt
index ec883538a90..221e4238035 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt
@@ -13,7 +13,7 @@ FILE: first.kt
             this@R|/Private|.R|/Private.bar|()
             R|/Private.Nested.Nested|()
             this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|()
-            Q|Private.NotCompanion|.<Inapplicable(HIDDEN): [/Private.NotCompanion.foo]>#()
+            Q|Private.NotCompanion|.<HIDDEN: /Private.NotCompanion.foo is invisible>#()
         }
 
         public[private] final inner class Inner : R|kotlin/Any| {
@@ -24,7 +24,7 @@ FILE: first.kt
             public[private] final fun foo(): R|kotlin/Unit| {
                 this@R|/Private|.R|/Private.bar|()
                 this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|()
-                Q|Private.NotCompanion|.<Inapplicable(HIDDEN): [/Private.NotCompanion.foo]>#()
+                Q|Private.NotCompanion|.<HIDDEN: /Private.NotCompanion.foo is invisible>#()
             }
 
         }
@@ -36,7 +36,7 @@ FILE: first.kt
 
             public[private] final fun foo(): R|kotlin/Unit| {
                 this@R|/Private.Companion|.R|/Private.Companion.fromCompanion|()
-                Q|Private.NotCompanion|.<Inapplicable(HIDDEN): [/Private.NotCompanion.foo]>#()
+                Q|Private.NotCompanion|.<HIDDEN: /Private.NotCompanion.foo is invisible>#()
             }
 
         }
@@ -89,18 +89,18 @@ FILE: first.kt
         }
 
         R|/Local.Local|().R|/Local.baz|()
-        R|/Local.Local|().<Inapplicable(HIDDEN): [/Local.bar]>#()
+        R|/Local.Local|().<HIDDEN: /Local.bar is invisible>#()
     }
     public final fun test(): R|kotlin/Unit| {
         R|/foo|()
         R|/Private.Private|().R|/Private.baz|()
         R|/Private.Private|().R|/Private.Inner.Inner|()
-        R|/Private.Private|().<Inapplicable(HIDDEN): [/Private.bar]>#()
-        Q|Private|.<Inapplicable(HIDDEN): [/Private.Nested.Nested]>#()
-        Q|Private|.<Inapplicable(HIDDEN): [/Private.Companion.fromCompanion]>#()
+        R|/Private.Private|().<HIDDEN: /Private.bar is invisible>#()
+        Q|Private|.<HIDDEN: /Private.Nested.Nested is invisible>#()
+        Q|Private|.<HIDDEN: /Private.Companion.fromCompanion is invisible>#()
     }
 FILE: second.kt
     public final fun secondTest(): R|kotlin/Unit| {
-        <Inapplicable(HIDDEN): [/foo]>#()
-        <Inapplicable(HIDDEN): [/Private.Private]>#()
+        <HIDDEN: /foo is invisible>#()
+        <HIDDEN: /Private.Private is invisible>#()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.kt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.kt
index 278a3280834..f27cce779d2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.kt
@@ -31,7 +31,7 @@ class Derived : Protected() {
     fun foo() {
         bar()
         Nested().foo()
-        Nested().<!INAPPLICABLE_CANDIDATE!>bar<!>() // hidden
+        Nested().<!HIDDEN!>bar<!>() // hidden
 
         fromCompanion()
         protectedFromCompanion()
@@ -48,8 +48,8 @@ fun test() {
     Protected().baz()
     Protected().Inner()
 
-    Protected().<!INAPPLICABLE_CANDIDATE!>bar<!>() // hidden
-    Protected.<!INAPPLICABLE_CANDIDATE!>Nested<!>() // hidden
+    Protected().<!HIDDEN!>bar<!>() // hidden
+    Protected.<!HIDDEN!>Nested<!>() // hidden
 }
 
 open class Generic<T>(val x: T) {
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
index d74b2d7669a..6c348b0b3c2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
@@ -59,7 +59,7 @@ FILE: protectedVisibility.kt
         public final fun foo(): R|kotlin/Unit| {
             this@R|/Derived|.R|/Protected.bar|()
             R|/Protected.Nested.Nested|().R|/Protected.Nested.foo|()
-            R|/Protected.Nested.Nested|().<Inapplicable(HIDDEN): [/Protected.Nested.bar]>#()
+            R|/Protected.Nested.Nested|().<HIDDEN: /Protected.Nested.bar is invisible>#()
             this@R|/Protected.Companion|.R|/Protected.Companion.fromCompanion|()
             this@R|/Protected.Companion|.R|/Protected.Companion.protectedFromCompanion|()
         }
@@ -79,8 +79,8 @@ FILE: protectedVisibility.kt
     public final fun test(): R|kotlin/Unit| {
         R|/Protected.Protected|().R|/Protected.baz|()
         R|/Protected.Protected|().R|/Protected.Inner.Inner|()
-        R|/Protected.Protected|().<Inapplicable(HIDDEN): [/Protected.bar]>#()
-        Q|Protected|.<Inapplicable(HIDDEN): [/Protected.Nested.Nested]>#()
+        R|/Protected.Protected|().<HIDDEN: /Protected.bar is invisible>#()
+        Q|Protected|.<HIDDEN: /Protected.Nested.Nested is invisible>#()
     }
     public open class Generic<T> : R|kotlin/Any| {
         public constructor<T>(x: R|T|): R|Generic<T>| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
index 8e382a362ea..cb34d66a436 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
@@ -36,7 +36,7 @@ FILE: test.kt
         lval bar: R|kotlin/CharSequence?| = R|<local>/x|?.{ $subj$.R|/SomeClass.bar| }
         when () {
             !=(R|<local>/bar|, Null(null)) ->  {
-                R|<local>/x|.R|/SomeClass.bar|.<Inapplicable(WRONG_RECEIVER): [kotlin/CharSequence.length]>#
+                R|<local>/x|.R|/SomeClass.bar|.<Inapplicable(WRONG_RECEIVER): kotlin/CharSequence.length>#
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt
index c80de5e09a6..5c4218a0dd5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt
@@ -11,7 +11,7 @@ FILE: nullableIntegerLiteralType.kt
             }
         }
 
-        <Inapplicable(INAPPLICABLE): [/takeInt]>#(R|<local>/x|)
+        <Inapplicable(INAPPLICABLE): /takeInt>#(R|<local>/x|)
     }
     public final fun test_2(b: R|kotlin/Boolean|, y: R|kotlin/Int|): R|kotlin/Unit| {
         lval x: R|kotlin/Int?| = when () {
@@ -23,5 +23,5 @@ FILE: nullableIntegerLiteralType.kt
             }
         }
 
-        <Inapplicable(INAPPLICABLE): [/takeInt]>#(R|<local>/x|)
+        <Inapplicable(INAPPLICABLE): /takeInt>#(R|<local>/x|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
index cffd9ee6a46..0d23752d58e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
@@ -24,7 +24,7 @@ FILE: receiverWithCapturedType.kt
         R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CallableDescriptor|>()
     }
     public final fun test_2_1(resolvedCall: R|ResolvedCall<out CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
-        lval x: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/updateD]> = R|<local>/resolvedCall|.<Inapplicable(INAPPLICABLE): [/updateD]>#(R|<local>/d|)
+        lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.<Inapplicable(INAPPLICABLE): /updateD>#<R|CapturedType(out CallableDescriptor)|>(R|<local>/d|)
     }
     public final fun test_2_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
         lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CapturedType(in CallableDescriptor)|>(R|<local>/d|)
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
index 2fd08db01c9..05ea7cf3d39 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
@@ -29,7 +29,7 @@ FILE: lambdaArgInScopeFunction.kt
         }
         ) }
         R|<local>/lambda|.R|tests/_checkType/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function0<KotlinClass>?>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Unit) -> KotlinClass?|>()
         }
         )
     }
@@ -50,7 +50,7 @@ FILE: lambdaArgInScopeFunction.kt
         }
         )
         R|<local>/lambda|.R|tests/_checkType/checkType|<R|() -> KotlinClass|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function0<KotlinClass>>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Unit) -> KotlinClass?|>()
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
index 135b23a5b72..6d0cbee9c7d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
@@ -29,11 +29,11 @@ FILE: KotlinClass.kt
         }
         )
         R|<local>/invalidType|.R|tests/_checkType/checkType|<R|(JavaClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<JavaClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
         R|/Case1.Case1|(R|<local>/javaClass|).R|/Case1.x|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
     }
@@ -122,11 +122,11 @@ FILE: KotlinClass.kt
         }
         )
         R|<local>/invalidType|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
         R|/Case2.Case2|(R|<local>/kotlinClass|).R|/Case2.x|.R|tests/_checkType/checkType|<R|(KotlinClass) -> kotlin/Boolean|>(<L> = checkType@fun R|tests/_checkType/Inv<kotlin/Function1<KotlinClass, kotlin/Boolean>>|.<anonymous>(): R|kotlin/Unit| {
-            ^ <Inapplicable(WRONG_RECEIVER): [tests/_checkType/_]>#()
+            this@R|special/anonymous|.<Inapplicable(WRONG_RECEIVER): tests/_checkType/_>#<R|(kotlin/Nothing) -> kotlin/Boolean|>()
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
index a0b03646d19..29fb97aca71 100644
--- a/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/nested/innerTypes.txt
@@ -29,9 +29,9 @@ FILE: innerTypes.kt
     public final val rrq: R|Outer.Inner<kotlin/Int, kotlin/String>| = R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|()
         public get(): R|Outer.Inner<kotlin/Int, kotlin/String>|
     public final fun check(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
-        <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/String|>())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/Int|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/String|>())
         R|/accept|(R|/Outer.Outer|<R|kotlin/String|>().R|/Outer.Inner.Inner|<R|kotlin/Int|>())
-        <Inapplicable(INAPPLICABLE): [/accept]>#(R|/Boxed.Boxed|<R|kotlin/Int|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/Int>|>|())
+        <Inapplicable(INAPPLICABLE): /accept>#(R|/Boxed.Boxed|<R|kotlin/Int|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/Int>|>|())
         R|/accept|(R|/Boxed.Boxed|<R|kotlin/String|>().R|FakeOverride</Boxed.substitute: R|Outer.Inner<kotlin/Int, kotlin/String>|>|())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
index 56fd4e8522a..1cb76bb2493 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
@@ -14,7 +14,7 @@ class B : A() {
     fun test() {
         foo()
         bar()
-        <!INAPPLICABLE_CANDIDATE!>buz<!>()
+        <!NONE_APPLICABLE!>buz<!>()
     }
 }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt
index 96d586f583e..7ab286143cb 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt
@@ -37,7 +37,7 @@ FILE: simple.kt
         public final fun test(): R|kotlin/Unit| {
             this@R|/B|.R|/B.foo|()
             this@R|/B|.R|/B.bar|()
-            <Inapplicable(PARAMETER_MAPPING_ERROR): [/B.buz, /A.buz]>#()
+            <Ambiguity: buz, [/B.buz, /A.buz]>#()
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
index 2580c3deb05..36cb9664b7a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
@@ -24,5 +24,5 @@ FILE: supertypeGenericsComplex.kt
     }
     public final fun f(list: R|kotlin/collections/MutableList<X>|, s: R|kotlin/collections/MutableList<kotlin/CharSequence>|): R|kotlin/Unit| {
         R|/C.C|().R|FakeOverride</C.f: R|kotlin/Unit|>|<R|X|>(R|<local>/list|, R|<local>/s|)
-        R|/C.C|().<Inapplicable(INAPPLICABLE): [/C.f]>#(R|<local>/s|, R|<local>/list|)
+        R|/C.C|().<Inapplicable(INAPPLICABLE): /C.f>#<R|kotlin/CharSequence|>(R|<local>/s|, R|<local>/list|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt b/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt
index 35936f324bf..3b082dd4a0d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun <V> R|SLRUMap<V>|.getOrPut(value: R|V|): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/SLRUMap.takeV]>#(R|<local>/value|)
+        this@R|/getOrPut|.<Inapplicable(INAPPLICABLE): /SLRUMap.takeV>#(R|<local>/value|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
index edea02d289b..ef1f2089c4a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
@@ -14,7 +14,7 @@ FILE: main.kt
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
         }
         ))
-        <Inapplicable(INAPPLICABLE): [/foo2]>#(R|/MyFunction|<R|ft<kotlin/Int, kotlin/Int?>!|, R|ft<kotlin/String, kotlin/String?>!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
+        <Inapplicable(INAPPLICABLE): /foo2>#(R|/MyFunction|<R|kotlin/Number|, R|ft<kotlin/String, kotlin/String?>!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
             ^ R|<local>/x|.R|kotlin/Any.toString|()
         }
         ))
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt
index bd33352729b..ee199674e3b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt
@@ -5,11 +5,11 @@ FILE: main.kt
         ^MyRunnable Int(1)
     }
     public final fun main(): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/foo]>#(R|/MyRunnable|(<L> = MyRunnable@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
+        <Inapplicable(INAPPLICABLE): /foo>#(R|/MyRunnable|(<L> = MyRunnable@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
         ))
-        <Inapplicable(INAPPLICABLE): [/foo]>#(R|/MyRunnable|(MyRunnable@fun <anonymous>(it: R|kotlin/Int|): R|kotlin/Boolean| {
+        <Inapplicable(INAPPLICABLE): /foo>#(R|/MyRunnable|(MyRunnable@fun <anonymous>(it: R|kotlin/Int|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/it|.R|kotlin/Int.compareTo|(Int(1)))
         }
         ))
@@ -17,5 +17,5 @@ FILE: main.kt
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
 
-        <Inapplicable(INAPPLICABLE): [/foo]>#(R|/MyRunnable|(R|<local>/x|))
+        <Inapplicable(INAPPLICABLE): /foo>#(R|/MyRunnable|(R|<local>/x|))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
index d170c3508e5..f6758085a0f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
@@ -8,7 +8,7 @@ FILE: main.kt
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Any.toString|()
         }
         )
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo2]>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String| {
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>!| {
             ^ R|<local>/x|.R|kotlin/Any.toString|()
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt
index c9d524a906d..b2161f7954e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt
@@ -38,16 +38,16 @@ FILE: kotlinSam.kt
         }
         )
         R|/foo1|(R|<local>/f|)
-        <Inapplicable(INAPPLICABLE): [/foo2]>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
+        <Inapplicable(INAPPLICABLE): /foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/x|.<Unresolved name: compareTo>#(Int(1)))
         }
         )
-        <Inapplicable(INAPPLICABLE): [/foo2]>#(R|<local>/f|)
-        <Inapplicable(INAPPLICABLE): [/foo3]>#(<L> = foo3@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
+        <Inapplicable(INAPPLICABLE): /foo2>#(R|<local>/f|)
+        <Inapplicable(INAPPLICABLE): /foo3>#(<L> = foo3@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/x|.<Unresolved name: compareTo>#(Int(1)))
         }
         )
-        <Inapplicable(INAPPLICABLE): [/foo3]>#(R|<local>/f|)
+        <Inapplicable(INAPPLICABLE): /foo3>#(R|<local>/f|)
         R|/foo4|(<L> = foo4@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
index b9ffbb30e9b..d8145c5f91d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
@@ -2,11 +2,11 @@ FILE: main.kt
     public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(<L> = foo@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo>#(<L> = foo@fun <anonymous>(x: R|kotlin/Nothing|): R|kotlin/Boolean| {
             ^ CMP(>, R|<local>/x|.<Unresolved name: compareTo>#(Int(1)))
         }
         )
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(foo@fun <anonymous>(): R|kotlin/Boolean| {
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo>#(foo@fun <anonymous>(): R|kotlin/Boolean| {
             ^ CMP(>, <Unresolved name: it>#.<Unresolved name: compareTo>#(Int(1)))
         }
         )
@@ -14,5 +14,5 @@ FILE: main.kt
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
 
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): [/JavaUsage.foo]>#(R|<local>/x|)
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo>#(R|<local>/x|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/sealedClass.kt b/compiler/fir/analysis-tests/testData/resolve/sealedClass.kt
index ae5a69ea932..071205181ae 100644
--- a/compiler/fir/analysis-tests/testData/resolve/sealedClass.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/sealedClass.kt
@@ -6,5 +6,5 @@ sealed class WithPrivateConstructor private constructor(val x: Int) {
     private constructor() : this(42)
 }
 
-object First : <!INAPPLICABLE_CANDIDATE!>WithPrivateConstructor<!>() // error
-object Second : <!INAPPLICABLE_CANDIDATE!>WithPrivateConstructor<!>(0) // error
\ No newline at end of file
+object First : <!NONE_APPLICABLE!>WithPrivateConstructor<!>() // error
+object Second : <!NONE_APPLICABLE!>WithPrivateConstructor<!>(0) // error
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot
index 61d9f031287..86c29ded340 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.dot
@@ -202,7 +202,7 @@ digraph bangbang_kt {
                 78 [label="Exit when"];
             }
             79 [label="Access variable R|<local>/a|"];
-            80 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            80 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             81 [label="Exit block"];
         }
         82 [label="Exit function test_3" style="filled" fillcolor=red];
@@ -331,14 +331,14 @@ digraph bangbang_kt {
                     color=blue
                     123 [label="Enter block"];
                     124 [label="Access variable R|<local>/a|"];
-                    125 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    125 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     126 [label="Exit block"];
                 }
                 127 [label="Exit when branch result"];
                 128 [label="Exit when"];
             }
             129 [label="Access variable R|<local>/a|"];
-            130 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            130 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             131 [label="Exit block"];
         }
         132 [label="Exit function test_5" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt
index e8fe8566705..999c67a91a5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt
@@ -32,7 +32,7 @@ FILE: bangbang.kt
             }
         }
 
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun test_4(a: R|A?|, b: R|kotlin/Boolean|): R|kotlin/Unit| {
         when () {
@@ -46,11 +46,11 @@ FILE: bangbang.kt
     public final fun test_5(a: R|A?|, b: R|kotlin/Boolean|): R|kotlin/Unit| {
         when () {
             R|<local>/b| || R|<local>/a|!!.R|/A.foo|() ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun <X : R|A?|> test_6(x: R|X|): R|kotlin/Unit| {
         R|<local>/x|!!.R|/A.foo|()
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot
index 1737abc42e4..ff028b96aea 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.dot
@@ -53,7 +53,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     19 [label="Enter block"];
                     20 [label="Access variable R|<local>/b|"];
-                    21 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    21 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     22 [label="Exit block"];
                 }
                 23 [label="Exit when branch result"];
@@ -137,7 +137,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     52 [label="Enter block"];
                     53 [label="Access variable R|<local>/b|"];
-                    54 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    54 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     55 [label="Exit block"];
                 }
                 56 [label="Exit when branch result"];
@@ -212,7 +212,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     79 [label="Enter block"];
                     80 [label="Access variable R|<local>/b|"];
-                    81 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    81 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     82 [label="Exit block"];
                 }
                 83 [label="Exit when branch result"];
@@ -278,7 +278,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     100 [label="Enter block"];
                     101 [label="Access variable R|<local>/b|"];
-                    102 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    102 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     103 [label="Exit block"];
                 }
                 104 [label="Exit when branch result"];
@@ -362,7 +362,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     133 [label="Enter block"];
                     134 [label="Access variable R|<local>/b|"];
-                    135 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    135 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     136 [label="Exit block"];
                 }
                 137 [label="Exit when branch result"];
@@ -428,7 +428,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     154 [label="Enter block"];
                     155 [label="Access variable R|<local>/b|"];
-                    156 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    156 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     157 [label="Exit block"];
                 }
                 158 [label="Exit when branch result"];
@@ -503,7 +503,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     181 [label="Enter block"];
                     182 [label="Access variable R|<local>/b|"];
-                    183 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    183 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     184 [label="Exit block"];
                 }
                 185 [label="Exit when branch result"];
@@ -587,7 +587,7 @@ digraph equalsToBoolean_kt {
                     color=blue
                     214 [label="Enter block"];
                     215 [label="Access variable R|<local>/b|"];
-                    216 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()"];
+                    216 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()"];
                     217 [label="Exit block"];
                 }
                 218 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt
index 543533b04fb..b110b35eae8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt
@@ -12,7 +12,7 @@ FILE: equalsToBoolean.kt
                 R|<local>/b|.R|kotlin/Boolean.not|()
             }
             else ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
         }
 
@@ -20,7 +20,7 @@ FILE: equalsToBoolean.kt
     public final fun test_2(b: R|kotlin/Boolean?|): R|kotlin/Unit| {
         when () {
             !=(==(R|<local>/b|, Boolean(true)), Boolean(true)) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
             else ->  {
                 R|<local>/b|.R|kotlin/Boolean.not|()
@@ -31,7 +31,7 @@ FILE: equalsToBoolean.kt
     public final fun test_3(b: R|kotlin/Boolean?|): R|kotlin/Unit| {
         when () {
             ==(==(R|<local>/b|, Boolean(true)), Boolean(false)) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
             else ->  {
                 R|<local>/b|.R|kotlin/Boolean.not|()
@@ -45,7 +45,7 @@ FILE: equalsToBoolean.kt
                 R|<local>/b|.R|kotlin/Boolean.not|()
             }
             else ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
         }
 
@@ -53,7 +53,7 @@ FILE: equalsToBoolean.kt
     public final fun test_5(b: R|kotlin/Boolean?|): R|kotlin/Unit| {
         when () {
             ==(!=(R|<local>/b|, Boolean(true)), Boolean(true)) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
             else ->  {
                 R|<local>/b|.R|kotlin/Boolean.not|()
@@ -67,7 +67,7 @@ FILE: equalsToBoolean.kt
                 R|<local>/b|.R|kotlin/Boolean.not|()
             }
             else ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
         }
 
@@ -78,7 +78,7 @@ FILE: equalsToBoolean.kt
                 R|<local>/b|.R|kotlin/Boolean.not|()
             }
             else ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
         }
 
@@ -86,7 +86,7 @@ FILE: equalsToBoolean.kt
     public final fun test_8(b: R|kotlin/Boolean?|): R|kotlin/Unit| {
         when () {
             !=(!=(R|<local>/b|, Boolean(true)), Boolean(false)) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Boolean.not]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Boolean.not>#()
             }
             else ->  {
                 R|<local>/b|.R|kotlin/Boolean.not|()
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot
index ac24806a22a..9db0364683c 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.dot
@@ -267,7 +267,7 @@ digraph jumpFromRhsOfOperator_kt {
                 101 [label="Exit ||"];
             }
             102 [label="Access variable R|<local>/a|"];
-            103 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            103 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             104 [label="Exit block"];
         }
         105 [label="Exit function test_5" style="filled" fillcolor=red];
@@ -309,7 +309,7 @@ digraph jumpFromRhsOfOperator_kt {
                 117 [label="Exit &&"];
             }
             118 [label="Access variable R|<local>/a|"];
-            119 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            119 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             120 [label="Exit block"];
         }
         121 [label="Exit function teat_6" style="filled" fillcolor=red];
@@ -364,14 +364,14 @@ digraph jumpFromRhsOfOperator_kt {
                     color=blue
                     139 [label="Enter block"];
                     140 [label="Access variable R|<local>/a|"];
-                    141 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    141 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     142 [label="Exit block"];
                 }
                 143 [label="Exit when branch result"];
                 144 [label="Exit when"];
             }
             145 [label="Access variable R|<local>/a|"];
-            146 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            146 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             147 [label="Exit block"];
         }
         148 [label="Exit function test_7" style="filled" fillcolor=red];
@@ -437,14 +437,14 @@ digraph jumpFromRhsOfOperator_kt {
                     color=blue
                     166 [label="Enter block"];
                     167 [label="Access variable R|<local>/a|"];
-                    168 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    168 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     169 [label="Exit block"];
                 }
                 170 [label="Exit when branch result"];
                 171 [label="Exit when"];
             }
             172 [label="Access variable R|<local>/a|"];
-            173 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            173 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             174 [label="Exit block"];
         }
         175 [label="Exit function test_8" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt
index 56bdb1afca4..bba3fe4dde4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt
@@ -31,27 +31,27 @@ FILE: jumpFromRhsOfOperator.kt
     }
     public final fun test_5(a: R|A?|): R|kotlin/Unit| {
         ==(R|<local>/a|, Null(null)) || throw R|java/lang/Exception.Exception|()
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun teat_6(a: R|A?|): R|kotlin/Unit| {
         !=(R|<local>/a|, Null(null)) && throw R|java/lang/Exception.Exception|()
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun test_7(a: R|A?|): R|kotlin/Unit| {
         when () {
             ==(R|<local>/a|, Null(null)) || throw R|java/lang/Exception.Exception|() ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun test_8(a: R|A?|): R|kotlin/Unit| {
         when () {
             !=(R|<local>/a|, Null(null)) && throw R|java/lang/Exception.Exception|() ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
index eaa3698a9db..f3be68dcb22 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot
@@ -670,7 +670,7 @@ digraph boundSmartcastsInBranches_kt {
                     274 [label="Access variable R|<local>/x|"];
                     275 [label="Access variable R|kotlin/String.length|"];
                     276 [label="Access variable R|<local>/y|"];
-                    277 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    277 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     278 [label="Access variable R|<local>/z|"];
                     279 [label="Access variable R|kotlin/String.length|"];
                     280 [label="Exit block"];
@@ -695,11 +695,11 @@ digraph boundSmartcastsInBranches_kt {
                     color=blue
                     291 [label="Enter block"];
                     292 [label="Access variable R|<local>/x|"];
-                    293 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    293 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     294 [label="Access variable R|<local>/y|"];
                     295 [label="Access variable R|kotlin/String.length|"];
                     296 [label="Access variable R|<local>/z|"];
-                    297 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    297 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     298 [label="Exit block"];
                 }
                 299 [label="Exit when branch result"];
@@ -724,7 +724,7 @@ digraph boundSmartcastsInBranches_kt {
                     310 [label="Access variable R|<local>/x|"];
                     311 [label="Access variable R|kotlin/String.length|"];
                     312 [label="Access variable R|<local>/y|"];
-                    313 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    313 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     314 [label="Access variable R|<local>/z|"];
                     315 [label="Access variable R|kotlin/String.length|"];
                     316 [label="Exit block"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
index d13aca2ae60..b652bc4e03f 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
@@ -132,23 +132,23 @@ FILE: boundSmartcastsInBranches.kt
         when () {
             !=(R|<local>/x|, Null(null)) ->  {
                 R|<local>/x|.R|kotlin/String.length|
-                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
                 R|<local>/z|.R|kotlin/String.length|
             }
         }
 
         when () {
             !=(R|<local>/y|, Null(null)) ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
                 R|<local>/y|.R|kotlin/String.length|
-                R|<local>/z|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/z|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
         }
 
         when () {
             !=(R|<local>/z|, Null(null)) ->  {
                 R|<local>/x|.R|kotlin/String.length|
-                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
                 R|<local>/z|.R|kotlin/String.length|
             }
         }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot
index 7b415486a91..49f0d97b8e1 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.dot
@@ -136,9 +136,9 @@ digraph equalsAndIdentity_kt {
                     color=blue
                     50 [label="Enter block"];
                     51 [label="Access variable R|<local>/x|"];
-                    52 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    52 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     53 [label="Access variable R|<local>/y|"];
-                    54 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    54 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     55 [label="Exit block"];
                 }
                 56 [label="Exit when branch result"];
@@ -161,9 +161,9 @@ digraph equalsAndIdentity_kt {
                     color=blue
                     66 [label="Enter block"];
                     67 [label="Access variable R|<local>/x|"];
-                    68 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    68 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     69 [label="Access variable R|<local>/y|"];
-                    70 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    70 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     71 [label="Exit block"];
                 }
                 72 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt
index a14f253607c..095a40383cf 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt
@@ -22,15 +22,15 @@ FILE: equalsAndIdentity.kt
     public final fun test_2(x: R|A?|, y: R|A?|): R|kotlin/Unit| {
         when () {
             ==(R|<local>/x|, R|<local>/y|) ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
-                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
+                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
         when () {
             ===(R|<local>/x|, R|<local>/y|) ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
-                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
+                R|<local>/y|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot
index 59b82a8be7a..4a7ac514c75 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot
@@ -264,7 +264,7 @@ digraph nullability_kt {
                     color=blue
                     84 [label="Enter block"];
                     85 [label="Access variable R|<local>/x|"];
-                    86 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    86 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     87 [label="Exit block"];
                 }
                 88 [label="Exit when branch result"];
@@ -280,7 +280,7 @@ digraph nullability_kt {
                 95 [label="Exit when"];
             }
             96 [label="Access variable R|<local>/x|"];
-            97 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            97 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             98 [label="Exit block"];
         }
         99 [label="Exit function test_1" style="filled" fillcolor=red];
@@ -348,14 +348,14 @@ digraph nullability_kt {
                     color=blue
                     117 [label="Enter block"];
                     118 [label="Access variable R|<local>/x|"];
-                    119 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+                    119 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
                     120 [label="Exit block"];
                 }
                 121 [label="Exit when branch result"];
                 122 [label="Exit when"];
             }
             123 [label="Access variable R|<local>/x|"];
-            124 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            124 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             125 [label="Exit block"];
         }
         126 [label="Exit function test_2" style="filled" fillcolor=red];
@@ -517,11 +517,11 @@ digraph nullability_kt {
                     184 [label="Access variable R|/Q.data|"];
                     185 [label="Access variable R|<local>/q|"];
                     186 [label="Access variable R|/Q.data|"];
-                    187 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
+                    187 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
                     188 [label="Access variable R|<local>/q|"];
                     189 [label="Access variable R|/Q.data|"];
-                    190 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
-                    191 [label="Function call: R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()"];
+                    190 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
+                    191 [label="Function call: R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()"];
                     192 [label="Exit block"];
                 }
                 193 [label="Exit when branch result"];
@@ -591,11 +591,11 @@ digraph nullability_kt {
             216 [label="Access variable R|/Q.data|"];
             217 [label="Access variable R|<local>/q|"];
             218 [label="Access variable R|/Q.data|"];
-            219 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
+            219 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
             220 [label="Access variable R|<local>/q|"];
             221 [label="Access variable R|/Q.data|"];
-            222 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
-            223 [label="Function call: R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()"];
+            222 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
+            223 [label="Function call: R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()"];
             224 [label="Exit block"];
         }
         225 [label="Exit function test_6" style="filled" fillcolor=red];
@@ -665,11 +665,11 @@ digraph nullability_kt {
                     247 [label="Function call: R|<local>/q|.R|/Q.fdata|()"];
                     248 [label="Access variable R|<local>/q|"];
                     249 [label="Function call: R|<local>/q|.R|/Q.fdata|()"];
-                    250 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): [/MyData.fs]>#()"];
+                    250 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): /MyData.fs>#()"];
                     251 [label="Access variable R|<local>/q|"];
                     252 [label="Function call: R|<local>/q|.R|/Q.fdata|()"];
-                    253 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): [/MyData.fs]>#()"];
-                    254 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): [/MyData.fs]>#().<Unresolved name: inc>#()"];
+                    253 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): /MyData.fs>#()"];
+                    254 [label="Function call: R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): /MyData.fs>#().R|kotlin/Int.inc|()"];
                     255 [label="Exit block"];
                 }
                 256 [label="Exit when branch result"];
@@ -794,7 +794,7 @@ digraph nullability_kt {
                 293 [label="Exit when"];
             }
             294 [label="Access variable R|<local>/b|"];
-            295 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            295 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_71 {
                 color=blue
                 296 [label="Enter when"];
@@ -819,7 +819,7 @@ digraph nullability_kt {
                 309 [label="Exit when"];
             }
             310 [label="Access variable R|<local>/b|"];
-            311 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            311 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_74 {
                 color=blue
                 312 [label="Enter when"];
@@ -844,7 +844,7 @@ digraph nullability_kt {
                 325 [label="Exit when"];
             }
             326 [label="Access variable R|<local>/b|"];
-            327 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            327 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_77 {
                 color=blue
                 328 [label="Enter when"];
@@ -869,7 +869,7 @@ digraph nullability_kt {
                 341 [label="Exit when"];
             }
             342 [label="Access variable R|<local>/b|"];
-            343 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            343 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             344 [label="Exit block"];
         }
         345 [label="Exit function test_9" style="filled" fillcolor=red];
@@ -965,14 +965,14 @@ digraph nullability_kt {
                     color=blue
                     356 [label="Enter block"];
                     357 [label="Access variable R|<local>/b|"];
-                    358 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+                    358 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
                     359 [label="Exit block"];
                 }
                 360 [label="Exit when branch result"];
                 361 [label="Exit when"];
             }
             362 [label="Access variable R|<local>/b|"];
-            363 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            363 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_85 {
                 color=blue
                 364 [label="Enter when"];
@@ -990,14 +990,14 @@ digraph nullability_kt {
                     color=blue
                     372 [label="Enter block"];
                     373 [label="Access variable R|<local>/b|"];
-                    374 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+                    374 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
                     375 [label="Exit block"];
                 }
                 376 [label="Exit when branch result"];
                 377 [label="Exit when"];
             }
             378 [label="Access variable R|<local>/b|"];
-            379 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            379 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_88 {
                 color=blue
                 380 [label="Enter when"];
@@ -1015,14 +1015,14 @@ digraph nullability_kt {
                     color=blue
                     388 [label="Enter block"];
                     389 [label="Access variable R|<local>/b|"];
-                    390 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+                    390 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
                     391 [label="Exit block"];
                 }
                 392 [label="Exit when branch result"];
                 393 [label="Exit when"];
             }
             394 [label="Access variable R|<local>/b|"];
-            395 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            395 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             subgraph cluster_91 {
                 color=blue
                 396 [label="Enter when"];
@@ -1040,14 +1040,14 @@ digraph nullability_kt {
                     color=blue
                     404 [label="Enter block"];
                     405 [label="Access variable R|<local>/b|"];
-                    406 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+                    406 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
                     407 [label="Exit block"];
                 }
                 408 [label="Exit when branch result"];
                 409 [label="Exit when"];
             }
             410 [label="Access variable R|<local>/b|"];
-            411 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            411 [label="Function call: R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()"];
             412 [label="Exit block"];
         }
         413 [label="Exit function test_10" style="filled" fillcolor=red];
@@ -1164,11 +1164,11 @@ digraph nullability_kt {
                     444 [label="Access variable R|/QImpl.data|"];
                     445 [label="Access variable R|<local>/q2|"];
                     446 [label="Access variable R|/QImpl.data|"];
-                    447 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
+                    447 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
                     448 [label="Access variable R|<local>/q2|"];
                     449 [label="Access variable R|/QImpl.data|"];
-                    450 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
-                    451 [label="Function call: R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()"];
+                    450 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
+                    451 [label="Function call: R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()"];
                     subgraph cluster_99 {
                         color=blue
                         452 [label="Enter when"];
@@ -1305,11 +1305,11 @@ digraph nullability_kt {
                     498 [label="Access variable R|/QImplWithCustomGetter.data|"];
                     499 [label="Access variable R|<local>/q|"];
                     500 [label="Access variable R|/QImplWithCustomGetter.data|"];
-                    501 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
+                    501 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
                     502 [label="Access variable R|<local>/q|"];
                     503 [label="Access variable R|/QImplWithCustomGetter.data|"];
-                    504 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
-                    505 [label="Function call: R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()"];
+                    504 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
+                    505 [label="Function call: R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()"];
                     506 [label="Exit block"];
                 }
                 507 [label="Exit when branch result"];
@@ -1388,11 +1388,11 @@ digraph nullability_kt {
                     532 [label="Access variable R|/QImplMutable.data|"];
                     533 [label="Access variable R|<local>/q|"];
                     534 [label="Access variable R|/QImplMutable.data|"];
-                    535 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
+                    535 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
                     536 [label="Access variable R|<local>/q|"];
                     537 [label="Access variable R|/QImplMutable.data|"];
-                    538 [label="Access variable <Inapplicable(WRONG_RECEIVER): [/MyData.s]>#"];
-                    539 [label="Function call: R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()"];
+                    538 [label="Access variable <Inapplicable(WRONG_RECEIVER): /MyData.s>#"];
+                    539 [label="Function call: R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()"];
                     540 [label="Exit block"];
                 }
                 541 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.kt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.kt
index 3df2ac9fb33..35b4d6f8b97 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.kt
@@ -68,7 +68,7 @@ fun test_5(q: Q?) {
     if (q?.data?.s?.inc() != null) {
         q.data // good
         q.data.<!INAPPLICABLE_CANDIDATE!>s<!> // should be bad
-        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.<!UNRESOLVED_REFERENCE!>inc<!>() // should be bad
+        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.inc() // should be bad
     }
 }
 
@@ -77,14 +77,14 @@ fun test_6(q: Q?) {
     q?.data?.s?.inc() ?: return
     q.data // good
     q.data.<!INAPPLICABLE_CANDIDATE!>s<!> // should be bad
-    q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.<!UNRESOLVED_REFERENCE!>inc<!>() // should be bad
+    q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.inc() // should be bad
 }
 
 fun test_7(q: Q?) {
     if (q?.fdata()?.fs()?.inc() != null) {
         q.fdata() // good
         q.fdata().<!INAPPLICABLE_CANDIDATE!>fs<!>() // bad
-        q.fdata().<!INAPPLICABLE_CANDIDATE!>fs<!>().<!UNRESOLVED_REFERENCE!>inc<!>() // bad
+        q.fdata().<!INAPPLICABLE_CANDIDATE!>fs<!>().inc() // bad
     }
 }
 
@@ -149,7 +149,7 @@ fun test_11(q: QImpl?, q2: QImpl) {
         // Issue: Smartcasting of QImpl.data affects all instances
         q2.data
         q2.data.<!INAPPLICABLE_CANDIDATE!>s<!> // should be bad
-        q2.data.<!INAPPLICABLE_CANDIDATE!>s<!>.<!UNRESOLVED_REFERENCE!>inc<!>() // should be bad
+        q2.data.<!INAPPLICABLE_CANDIDATE!>s<!>.inc() // should be bad
 
         if (q2.data != null) {
             q2.data.s
@@ -163,7 +163,7 @@ fun test_12(q: QImplWithCustomGetter?) {
     if (q?.data?.s?.inc() != null) {
         q.data // good
         q.data.<!INAPPLICABLE_CANDIDATE!>s<!> // should be bad
-        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.<!UNRESOLVED_REFERENCE!>inc<!>() // should be bad
+        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.inc() // should be bad
     }
 }
 
@@ -172,6 +172,6 @@ fun test_13(q: QImplMutable?) {
     if (q?.data?.s?.inc() != null) {
         q.data // good
         q.data.<!INAPPLICABLE_CANDIDATE!>s<!> // should be bad
-        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.<!UNRESOLVED_REFERENCE!>inc<!>() // should be bad
+        q.data.<!INAPPLICABLE_CANDIDATE!>s<!>.inc() // should be bad
     }
 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt
index 0f2025d36fb..f6675dcc8c9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt
@@ -67,23 +67,23 @@ FILE: nullability.kt
                 R|<local>/x|.R|/A.foo|()
             }
             else ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
         }
 
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun test_2(x: R|A?|): R|kotlin/Unit| {
         when () {
             ==(R|<local>/x|, Null(null)) ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
             }
             else ->  {
                 R|<local>/x|.R|/A.foo|()
             }
         }
 
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
     public final fun test_3(x: R|A?|): R|kotlin/Unit| {
         R|<local>/x| ?: ^test_3 Unit
@@ -102,8 +102,8 @@ FILE: nullability.kt
         when () {
             !=(R|<local>/q|?.{ $subj$.R|/Q.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) ->  {
                 R|<local>/q|.R|/Q.data|
-                R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#
-                R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()
+                R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#
+                R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()
             }
         }
 
@@ -111,15 +111,15 @@ FILE: nullability.kt
     public final fun test_6(q: R|Q?|): R|kotlin/Unit| {
         R|<local>/q|?.{ $subj$.R|/Q.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() } ?: ^test_6 Unit
         R|<local>/q|.R|/Q.data|
-        R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#
-        R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()
+        R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#
+        R|<local>/q|.R|/Q.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()
     }
     public final fun test_7(q: R|Q?|): R|kotlin/Unit| {
         when () {
             !=(R|<local>/q|?.{ $subj$.R|/Q.fdata|() }?.{ $subj$.R|/MyData.fs|() }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) ->  {
                 R|<local>/q|.R|/Q.fdata|()
-                R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): [/MyData.fs]>#()
-                R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): [/MyData.fs]>#().<Unresolved name: inc>#()
+                R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): /MyData.fs>#()
+                R|<local>/q|.R|/Q.fdata|().<Inapplicable(WRONG_RECEIVER): /MyData.fs>#().R|kotlin/Int.inc|()
             }
         }
 
@@ -139,58 +139,58 @@ FILE: nullability.kt
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ===(R|<local>/a|, R|<local>/b|) ->  {
                 R|<local>/b|.R|kotlin/Int.inc|()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ==(R|<local>/b|, R|<local>/a|) ->  {
                 R|<local>/b|.R|kotlin/Int.inc|()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ===(R|<local>/b|, R|<local>/a|) ->  {
                 R|<local>/b|.R|kotlin/Int.inc|()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
     }
     public final fun test_10(a: R|kotlin/Int?|, b: R|kotlin/Int?|): R|kotlin/Unit| {
         when () {
             ==(R|<local>/a|, R|<local>/b|) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ===(R|<local>/a|, R|<local>/b|) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ==(R|<local>/b|, R|<local>/a|) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
         when () {
             ===(R|<local>/b|, R|<local>/a|) ->  {
-                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+                R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
             }
         }
 
-        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()
+        R|<local>/b|.<Inapplicable(WRONG_RECEIVER): kotlin/Int.inc>#()
     }
     public final fun test_11(q: R|QImpl?|, q2: R|QImpl|): R|kotlin/Unit| {
         when () {
@@ -199,8 +199,8 @@ FILE: nullability.kt
                 R|<local>/q|.R|/QImpl.data|.R|/MyData.s|
                 R|<local>/q|.R|/QImpl.data|.R|/MyData.s|.R|kotlin/Int.inc|()
                 R|<local>/q2|.R|/QImpl.data|
-                R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#
-                R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()
+                R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#
+                R|<local>/q2|.R|/QImpl.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()
                 when () {
                     !=(R|<local>/q2|.R|/QImpl.data|, Null(null)) ->  {
                         R|<local>/q2|.R|/QImpl.data|.R|/MyData.s|
@@ -216,8 +216,8 @@ FILE: nullability.kt
         when () {
             !=(R|<local>/q|?.{ $subj$.R|/QImplWithCustomGetter.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) ->  {
                 R|<local>/q|.R|/QImplWithCustomGetter.data|
-                R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#
-                R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()
+                R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#
+                R|<local>/q|.R|/QImplWithCustomGetter.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()
             }
         }
 
@@ -226,8 +226,8 @@ FILE: nullability.kt
         when () {
             !=(R|<local>/q|?.{ $subj$.R|/QImplMutable.data| }?.{ $subj$.R|/MyData.s| }?.{ $subj$.R|kotlin/Int.inc|() }, Null(null)) ->  {
                 R|<local>/q|.R|/QImplMutable.data|
-                R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#
-                R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): [/MyData.s]>#.<Unresolved name: inc>#()
+                R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#
+                R|<local>/q|.R|/QImplMutable.data|.<Inapplicable(WRONG_RECEIVER): /MyData.s>#.R|kotlin/Int.inc|()
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt
index 0adf2def51c..2c4ff649ffa 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt
@@ -4,7 +4,7 @@ FILE: orInWhenBranch.kt
     public final fun test_1(a: R|kotlin/Any?|): R|kotlin/Unit| {
         when (R|<local>/a|) {
             ($subj$ is R|kotlin/String|) || ($subj$ is R|kotlin/Any|) ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /foo>#()
             }
         }
 
@@ -12,7 +12,7 @@ FILE: orInWhenBranch.kt
     public final fun test_2(a: R|kotlin/Any?|): R|kotlin/Unit| {
         when () {
             (R|<local>/a| is R|kotlin/String|) || (R|<local>/a| is R|kotlin/Any|) ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /foo>#()
             }
         }
 
@@ -20,7 +20,7 @@ FILE: orInWhenBranch.kt
     public final fun test_3(a: R|kotlin/Any?|, b: R|kotlin/Boolean|): R|kotlin/Unit| {
         when (R|<local>/a|) {
             ($subj$ is R|kotlin/String|) || ==($subj$, R|<local>/b|) ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /foo>#()
             }
         }
 
@@ -28,7 +28,7 @@ FILE: orInWhenBranch.kt
     public final fun test_4(a: R|kotlin/Any?|, b: R|kotlin/Boolean|): R|kotlin/Unit| {
         when () {
             (R|<local>/a| is R|kotlin/String|) || R|<local>/b| ->  {
-                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/foo]>#()
+                R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /foo>#()
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot
index ecc021b81e7..9a7a3cd2378 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.dot
@@ -54,7 +54,7 @@ digraph safeCallAndEqualityToBool_kt {
                     color=blue
                     21 [label="Enter block"];
                     22 [label="Access variable R|<local>/s|"];
-                    23 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    23 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     24 [label="Exit block"];
                 }
                 25 [label="Exit when branch result"];
@@ -131,7 +131,7 @@ digraph safeCallAndEqualityToBool_kt {
                     color=blue
                     49 [label="Enter block"];
                     50 [label="Access variable R|<local>/s|"];
-                    51 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    51 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     52 [label="Exit block"];
                 }
                 53 [label="Exit when branch result"];
@@ -217,7 +217,7 @@ digraph safeCallAndEqualityToBool_kt {
                     color=blue
                     83 [label="Enter block"];
                     84 [label="Access variable R|<local>/s|"];
-                    85 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    85 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     86 [label="Exit block"];
                 }
                 87 [label="Exit when branch result"];
@@ -294,7 +294,7 @@ digraph safeCallAndEqualityToBool_kt {
                     color=blue
                     111 [label="Enter block"];
                     112 [label="Access variable R|<local>/s|"];
-                    113 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+                    113 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
                     114 [label="Exit block"];
                 }
                 115 [label="Exit when branch result"];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt
index cf740b26352..429d819020e 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt
@@ -8,7 +8,7 @@ FILE: safeCallAndEqualityToBool.kt
                 R|<local>/s|.R|kotlin/String.length|
             }
             else ->  {
-                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
         }
 
@@ -19,7 +19,7 @@ FILE: safeCallAndEqualityToBool.kt
                 R|<local>/s|.R|kotlin/String.length|
             }
             else ->  {
-                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
         }
 
@@ -27,7 +27,7 @@ FILE: safeCallAndEqualityToBool.kt
     public final fun test_3(s: R|kotlin/String?|): R|kotlin/Unit| {
         when () {
             !=(R|<local>/s|?.{ $subj$.R|/check|() }, Boolean(true)) ->  {
-                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
             else ->  {
                 R|<local>/s|.R|kotlin/String.length|
@@ -38,7 +38,7 @@ FILE: safeCallAndEqualityToBool.kt
     public final fun test_4(s: R|kotlin/String?|): R|kotlin/Unit| {
         when () {
             !=(R|<local>/s|?.{ $subj$.R|/check|() }, Boolean(false)) ->  {
-                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
             else ->  {
                 R|<local>/s|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot
index 06114a7a9f0..e51055dc071 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot
@@ -53,7 +53,7 @@ digraph safeCalls_kt {
             19 [label="Function call: $subj$.R|/foo|(...)"];
             20 [label="Exit safe call"];
             21 [label="Access variable R|<local>/x|"];
-            22 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+            22 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
             23 [label="Exit block"];
         }
         24 [label="Exit function test" style="filled" fillcolor=red];
@@ -207,7 +207,7 @@ digraph safeCalls_kt {
             78 [label="Function call: $subj$.R|/A.bool|()"];
             79 [label="Exit safe call"];
             80 [label="Access variable R|<local>/x|"];
-            81 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.id]>#()"];
+            81 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.id>#()"];
             82 [label="Exit block"];
         }
         83 [label="Exit function test_4" style="filled" fillcolor=red];
@@ -271,7 +271,7 @@ digraph safeCalls_kt {
             101 [label="Function call: $subj$.R|/boo|(...)"];
             102 [label="Exit safe call"];
             103 [label="Access variable R|<local>/x|"];
-            104 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.id]>#()"];
+            104 [label="Function call: R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.id>#()"];
             105 [label="Exit block"];
         }
         106 [label="Exit function test_5" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt
index 0882d3231a6..a11922bc998 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt
@@ -6,7 +6,7 @@ FILE: safeCalls.kt
     }
     public final fun test(x: R|kotlin/String?|): R|kotlin/Unit| {
         R|<local>/x|?.{ $subj$.R|/foo|(==(R|<local>/x|.R|kotlin/String.length|, Int(1))) }
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
     }
     public abstract interface A : R|kotlin/Any| {
         public abstract fun bar(a: R|A|): R|kotlin/String|
@@ -28,7 +28,7 @@ FILE: safeCalls.kt
     }
     public final fun test_4(x: R|A?|): R|kotlin/Unit| {
         R|<local>/x|?.{ $subj$.R|/A.id|() }?.{ $subj$.R|/A.bool|() }
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.id]>#()
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.id>#()
     }
     public final fun R|kotlin/Any?|.boo(b: R|kotlin/Boolean|): R|kotlin/Unit| {
     }
@@ -37,5 +37,5 @@ FILE: safeCalls.kt
             ^test_5 Unit
         }
         ) }?.{ $subj$.R|/boo|(R|<local>/x|.R|/A.bool|()) }
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/A.id]>#()
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /A.id>#()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot
index f5908c15ff0..7539b0e8749 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.dot
@@ -77,7 +77,7 @@ digraph delayedAssignment_kt {
                 32 [label="Exit when"];
             }
             33 [label="Access variable R|<local>/a|"];
-            34 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()"];
+            34 [label="Function call: R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()"];
             35 [label="Exit block"];
         }
         36 [label="Exit function test" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt
index fe6a3e460b9..de11a016f20 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt
@@ -20,5 +20,5 @@ FILE: delayedAssignment.kt
             }
         }
 
-        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): [/A.foo]>#()
+        R|<local>/a|.<Inapplicable(WRONG_RECEIVER): /A.foo>#()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot
index ad282a50bce..6700e45b5cd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.dot
@@ -103,7 +103,7 @@ digraph smartcastAfterReassignment_kt {
             40 [label="Const: Null(null)"];
             41 [label="Assignment: R|<local>/x|"];
             42 [label="Access variable R|<local>/x|"];
-            43 [label="Access variable <Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#"];
+            43 [label="Access variable <Inapplicable(WRONG_RECEIVER): kotlin/String.length>#"];
             44 [label="Exit block"];
         }
         45 [label="Exit function test_3" style="filled" fillcolor=red];
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt
index afd95360515..7925ccc6398 100644
--- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt
@@ -19,5 +19,5 @@ FILE: smartcastAfterReassignment.kt
         R|<local>/x| = String()
         R|<local>/x|.R|kotlin/String.length|
         R|<local>/x| = Null(null)
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.kt b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.kt
index da715e91046..51a43a129e8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.kt
@@ -2,12 +2,12 @@ class A {
     companion object Comp {}
 
     fun foo() {
-        <!INAPPLICABLE_CANDIDATE!>Comp<!>()
+        <!HIDDEN!>Comp<!>()
     }
 }
 
 object B {
-    private val x = <!INAPPLICABLE_CANDIDATE!>B<!>()
+    private val x = <!HIDDEN!>B<!>()
 }
 
 class D {
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt
index f4dc1b073f3..1d00d23eb87 100644
--- a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt
@@ -12,7 +12,7 @@ FILE: singletonConstructors.kt
         }
 
         public final fun foo(): R|kotlin/Unit| {
-            <Inapplicable(HIDDEN): [/A.Comp.Comp]>#()
+            <HIDDEN: /A.Comp.Comp is invisible>#()
         }
 
     }
@@ -21,8 +21,8 @@ FILE: singletonConstructors.kt
             super<R|kotlin/Any|>()
         }
 
-        private final val x: <ERROR TYPE REF: Inapplicable(HIDDEN): [/B.B]> = <Inapplicable(HIDDEN): [/B.B]>#()
-            private get(): <ERROR TYPE REF: Inapplicable(HIDDEN): [/B.B]>
+        private final val x: R|B| = <HIDDEN: /B.B is invisible>#()
+            private get(): R|B|
 
     }
     public final class D : R|kotlin/Any| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.kt
index 6b358f8f5a7..17ef4ed5510 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.kt
@@ -34,13 +34,13 @@ fun main() {
     <!AMBIGUITY!>foo3<!>(KotlinClass::baz)
 
     // Type mismatch
-    <!INAPPLICABLE_CANDIDATE!>foo1<!>(KotlinClass::bar)
+    <!INAPPLICABLE_CANDIDATE!>foo1<!>(<!UNRESOLVED_REFERENCE!>KotlinClass::bar<!>)
     foo2(KotlinClass::bar)
     foo3(KotlinClass::bar)
 
     foo1(KotlinClass2::bar)
     // Type mismatch
-    <!INAPPLICABLE_CANDIDATE!>foo2<!>(KotlinClass2::bar)
+    <!INAPPLICABLE_CANDIDATE!>foo2<!>(<!UNRESOLVED_REFERENCE!>KotlinClass2::bar<!>)
     foo3(KotlinClass2::bar)
 }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt
index a704b4dfce2..57992cb5075 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt
@@ -53,10 +53,10 @@ FILE: main.kt
         R|/foo1|(Q|KotlinClass|::R|/KotlinClass.Companion.baz|)
         R|/foo2|(Q|KotlinClass|::R|/KotlinClass.baz|)
         <Ambiguity: foo3, [/foo3, /foo3]>#(Q|KotlinClass|::R|/KotlinClass.baz|)
-        <Inapplicable(INAPPLICABLE): [/foo1]>#(Q|KotlinClass|::R|/JavaClass.bar|)
+        <Inapplicable(INAPPLICABLE): /foo1>#(Q|KotlinClass|::<Unresolved reference: bar>#)
         R|/foo2|(Q|KotlinClass|::R|/JavaClass.bar|)
         R|/foo3|(Q|KotlinClass|::R|/JavaClass.bar|)
         R|/foo1|(Q|KotlinClass2|::R|/KotlinClass2.Companion.bar|)
-        <Inapplicable(INAPPLICABLE): [/foo2]>#(Q|KotlinClass2|::R|/KotlinClass2.bar|)
+        <Inapplicable(INAPPLICABLE): /foo2>#(Q|KotlinClass2|::<Unresolved reference: bar>#)
         R|/foo3|(Q|KotlinClass2|::R|/KotlinClass2.Companion.bar|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
index 3748bd5f86a..b2332695285 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.kt
@@ -7,6 +7,6 @@ fun <T> bar(f: (T) -> Unit, e: T) {}
 fun <T> baz(e: T, f: (T) -> Unit) {}
 
 fun test(a: A, b: B) {
-    <!INAPPLICABLE_CANDIDATE!>baz<!>(a, ::fooB)
-    <!INAPPLICABLE_CANDIDATE!>bar<!>(::fooB, a)
+    <!INAPPLICABLE_CANDIDATE!>baz<!>(a, <!UNRESOLVED_REFERENCE!>::fooB<!>)
+    <!INAPPLICABLE_CANDIDATE!>bar<!>(<!UNRESOLVED_REFERENCE!>::fooB<!>, a)
 }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
index 50048dd39ac..e925f515712 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
@@ -10,6 +10,6 @@ FILE: resolveCallableReferencesAfterAllSimpleArguments.kt
     public final fun <T> baz(e: R|T|, f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| {
     }
     public final fun test(a: R|A|, b: R|B|): R|kotlin/Unit| {
-        <Inapplicable(INAPPLICABLE): [/baz]>#(R|<local>/a|, ::R|/fooB|)
-        <Inapplicable(INAPPLICABLE): [/bar]>#(::R|/fooB|, R|<local>/a|)
+        <Inapplicable(INAPPLICABLE): /baz>#<R|A|>(R|<local>/a|, ::<Unresolved reference: fooB>#)
+        <Inapplicable(INAPPLICABLE): /bar>#<R|A|>(::<Unresolved reference: fooB>#, R|<local>/a|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.kt
index accabc12667..189e45d3611 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.kt
@@ -3,5 +3,5 @@ fun <T, R> use(x: (T) -> R): (T) -> R = x
 fun foo() = use(::bar)
 fun bar(x: String) = 1
 
-fun loop1() = <!INAPPLICABLE_CANDIDATE!>use<!>(::loop2)
+fun loop1() = <!INAPPLICABLE_CANDIDATE!>use<!>(<!UNRESOLVED_REFERENCE!>::loop2<!>)
 fun loop2() = loop1()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
index b85e9e78b55..a4aada100e8 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
@@ -8,8 +8,8 @@ FILE: implicitTypes.kt
     public final fun bar(x: R|kotlin/String|): R|kotlin/Int| {
         ^bar Int(1)
     }
-    public final fun loop1(): <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/use]> {
-        ^loop1 <Inapplicable(INAPPLICABLE): [/use]>#(::R|/loop2|)
+    public final fun loop1(): R|(kotlin/Any?) -> kotlin/Nothing| {
+        ^loop1 <Inapplicable(INAPPLICABLE): /use>#<R|kotlin/Any?|, R|kotlin/Nothing|>(::<Unresolved reference: loop2>#)
     }
     public final fun loop2(): <ERROR TYPE REF: cycle> {
         ^loop2 R|/loop1|()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt
index 0f5bdfb67c4..e37ded8cbbd 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt
@@ -10,7 +10,7 @@ FILE: notIsNullOrEmpty.kt
     public final fun test_2(s: R|kotlin/String?|): R|kotlin/Unit| {
         when () {
             R|<local>/s|.R|kotlin/text/isNullOrEmpty|() ->  {
-                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/s|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
             else ->  {
                 R|<local>/s|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt
index 56a85c143e3..e4a4cff670f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt
@@ -29,7 +29,7 @@ FILE: eqNotEq.kt
                 R|<local>/x|.R|kotlin/String.length|
             }
             else ->  {
-                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [kotlin/String.length]>#
+                R|<local>/x|.<Inapplicable(WRONG_RECEIVER): kotlin/String.length>#
             }
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt
index b1f87fc1770..281ac32ce30 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt
@@ -33,7 +33,7 @@ FILE: receivers.kt
             this@R|special/anonymous|.R|/myRequireNotNull|()
         }
         )
-        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): [/foo]>#()
+        R|<local>/x|.<Inapplicable(WRONG_RECEIVER): /foo>#()
     }
     public final fun test_4(x: R|A?|): R|kotlin/Unit| {
         R|kotlin/with|<R|A?|, R|kotlin/Unit|>(R|<local>/x|, <L> = with@fun R|A?|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
index bd143fb16da..46bc2d36099 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
@@ -22,24 +22,24 @@ import j.JavaProtected
 import j.JavaPackageLocal
 
 class A {
-    val p1 = JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaPPackage<!>
-    val p2 = JavaProtected.<!INAPPLICABLE_CANDIDATE!>javaPProtectedStatic<!>
-    val p3 = JavaProtected().<!INAPPLICABLE_CANDIDATE!>javaPProtectedPackage<!>
+    val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
+    val p2 = JavaProtected.<!HIDDEN!>javaPProtectedStatic<!>
+    val p3 = JavaProtected().<!HIDDEN!>javaPProtectedPackage<!>
 
     fun test() {
-        JavaProtected.<!INAPPLICABLE_CANDIDATE!>javaMProtectedStatic<!>()
-        JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaMPackage<!>()
+        JavaProtected.<!HIDDEN!>javaMProtectedStatic<!>()
+        JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
     }
 }
 
 class B : JavaProtected() {
-    val p1 = JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaPPackage<!>
+    val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
     val p2 = JavaProtected.javaPProtectedStatic
     val p3 = javaPProtectedPackage
 
     fun test() {
         JavaProtected.javaMProtectedStatic()
-        JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaMPackage<!>()
+        JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
     }
 }
 
@@ -59,4 +59,4 @@ class C {
         JavaProtected.javaMProtectedStatic()
         JavaPackageLocal.javaMPackage()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
index 318dd730b1e..79a4de66c35 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
@@ -4,18 +4,18 @@ FILE: k.kt
             super<R|kotlin/Any|>()
         }
 
-        public final val p1: <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]> = Q|j/JavaPackageLocal|.<Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]>#
-            public get(): <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]>
+        public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.<HIDDEN: j/JavaPackageLocal.javaPPackage is invisible>#
+            public get(): R|kotlin/Int|
 
-        public final val p2: <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedStatic]> = Q|j/JavaProtected|.<Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedStatic]>#
-            public get(): <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedStatic]>
+        public final val p2: R|kotlin/Int| = Q|j/JavaProtected|.<HIDDEN: j/JavaProtected.javaPProtectedStatic is invisible>#
+            public get(): R|kotlin/Int|
 
-        public final val p3: <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedPackage]> = R|j/JavaProtected.JavaProtected|().<Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedPackage]>#
-            public get(): <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaProtected.javaPProtectedPackage]>
+        public final val p3: R|kotlin/Int| = R|j/JavaProtected.JavaProtected|().<HIDDEN: j/JavaProtected.javaPProtectedPackage is invisible>#
+            public get(): R|kotlin/Int|
 
         public final fun test(): R|kotlin/Unit| {
-            Q|j/JavaProtected|.<Inapplicable(HIDDEN): [j/JavaProtected.javaMProtectedStatic]>#()
-            Q|j/JavaPackageLocal|.<Inapplicable(HIDDEN): [j/JavaPackageLocal.javaMPackage]>#()
+            Q|j/JavaProtected|.<HIDDEN: j/JavaProtected.javaMProtectedStatic is invisible>#()
+            Q|j/JavaPackageLocal|.<HIDDEN: j/JavaPackageLocal.javaMPackage is invisible>#()
         }
 
     }
@@ -24,8 +24,8 @@ FILE: k.kt
             super<R|j/JavaProtected|>()
         }
 
-        public final val p1: <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]> = Q|j/JavaPackageLocal|.<Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]>#
-            public get(): <ERROR TYPE REF: Inapplicable(HIDDEN): [j/JavaPackageLocal.javaPPackage]>
+        public final val p1: R|kotlin/Int| = Q|j/JavaPackageLocal|.<HIDDEN: j/JavaPackageLocal.javaPPackage is invisible>#
+            public get(): R|kotlin/Int|
 
         public final val p2: R|kotlin/Int| = Q|j/JavaProtected|.R|j/JavaProtected.javaPProtectedStatic|
             public get(): R|kotlin/Int|
@@ -35,7 +35,7 @@ FILE: k.kt
 
         public final fun test(): R|kotlin/Unit| {
             Q|j/JavaProtected|.R|j/JavaProtected.javaMProtectedStatic|()
-            Q|j/JavaPackageLocal|.<Inapplicable(HIDDEN): [j/JavaPackageLocal.javaMPackage]>#()
+            Q|j/JavaPackageLocal|.<HIDDEN: j/JavaPackageLocal.javaMPackage is invisible>#()
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
index 42790f78ada..8f176ab3c65 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
@@ -7,9 +7,9 @@ FILE: K1.kt
     }
     public final fun main(k: R|KSub|, vString: R|SuperClass.NestedInSuperClass<kotlin/String>|, vInt: R|SuperClass.NestedInSuperClass<kotlin/Int>|): R|kotlin/Unit| {
         R|<local>/k|.R|/J1.getImpl|().R|FakeOverride</J1.NestedIImpl.nestedI: R|kotlin/Unit|>|(R|<local>/vString|)
-        R|<local>/k|.R|/J1.getImpl|().<Inapplicable(INAPPLICABLE): [/J1.NestedIImpl.nestedI]>#(R|<local>/vInt|)
+        R|<local>/k|.R|/J1.getImpl|().<Inapplicable(INAPPLICABLE): /J1.NestedIImpl.nestedI>#(R|<local>/vInt|)
         R|<local>/k|.R|/J1.getNestedSubClass|().R|FakeOverride</J1.NestedSubClass.nested: R|kotlin/Unit|>|(String())
-        R|<local>/k|.R|/J1.getNestedSubClass|().<Inapplicable(INAPPLICABLE): [/J1.NestedSubClass.nested]>#(Int(1))
+        R|<local>/k|.R|/J1.getNestedSubClass|().<Inapplicable(INAPPLICABLE): /J1.NestedSubClass.nested>#(Int(1))
     }
 FILE: K2.kt
     public open class KFirst : R|SuperClass<kotlin/String>|, R|SuperI<kotlin/Int>| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
index f021cfdd380..9befa50c611 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
@@ -8,5 +8,5 @@ FILE: K1.kt
 FILE: K2.kt
     public final fun main(): R|kotlin/Unit| {
         Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|())
-        Q|JavaClass|.<Inapplicable(INAPPLICABLE): [/JavaClass.baz]>#(String())
+        Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(String())
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
index 514df44bbf3..f14d31a1cfa 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
@@ -9,6 +9,6 @@ FILE: K2.kt
     public final fun main(): R|kotlin/Unit| {
         Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|ft<kotlin/Int, kotlin/Int?>!|>())
         Q|JavaClass|.R|/JavaClass.baz|(R|/KotlinClass.KotlinClass|<R|kotlin/Int|>())
-        Q|JavaClass|.<Inapplicable(INAPPLICABLE): [/JavaClass.baz]>#(R|/KotlinClass.KotlinClass|<R|kotlin/String|>())
-        Q|JavaClass|.<Inapplicable(INAPPLICABLE): [/JavaClass.baz]>#(String())
+        Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(R|/KotlinClass.KotlinClass|<R|kotlin/String|>())
+        Q|JavaClass|.<Inapplicable(INAPPLICABLE): /JavaClass.baz>#(String())
     }
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
index 3128adb18bc..c37b14e0fa2 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind.*
 import org.jetbrains.kotlin.fir.expressions.FirErrorExpression
 import org.jetbrains.kotlin.fir.expressions.FirErrorLoop
 import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
+import org.jetbrains.kotlin.fir.resolve.calls.CandidateApplicability
 import org.jetbrains.kotlin.fir.resolve.diagnostics.*
 import org.jetbrains.kotlin.fir.types.FirErrorTypeRef
 
@@ -53,8 +54,13 @@ class ErrorNodeDiagnosticCollectorComponent(collector: AbstractDiagnosticCollect
             is ConeUnresolvedReferenceError -> FirErrors.UNRESOLVED_REFERENCE.on(source, diagnostic.name?.asString() ?: "<No name>")
             is ConeUnresolvedSymbolError -> FirErrors.UNRESOLVED_REFERENCE.on(source, diagnostic.classId.asString())
             is ConeUnresolvedNameError -> FirErrors.UNRESOLVED_REFERENCE.on(source, diagnostic.name.asString())
-            is ConeInapplicableCandidateError -> FirErrors.INAPPLICABLE_CANDIDATE.on(source, diagnostic.candidates.map { it.symbol })
-            is ConeAmbiguityError -> FirErrors.AMBIGUITY.on(source, diagnostic.candidates)
+            is ConeHiddenCandidateError -> FirErrors.HIDDEN.on(source, diagnostic.candidateSymbol)
+            is ConeInapplicableCandidateError -> FirErrors.INAPPLICABLE_CANDIDATE.on(source, diagnostic.candidateSymbol)
+            is ConeAmbiguityError -> if (diagnostic.applicability < CandidateApplicability.SYNTHETIC_RESOLVED) {
+                FirErrors.NONE_APPLICABLE.on(source, diagnostic.candidates)
+            } else {
+                FirErrors.AMBIGUITY.on(source, diagnostic.candidates)
+            }
             is ConeOperatorAmbiguityError -> FirErrors.ASSIGN_OPERATOR_AMBIGUITY.on(source, diagnostic.candidates)
             is ConeVariableExpectedError -> FirErrors.VARIABLE_EXPECTED.on(source)
             is ConeTypeMismatchError -> FirErrors.TYPE_MISMATCH.on(source, diagnostic.expectedType, diagnostic.actualType)
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
index 963695bef2e..8954cc74b0f 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.NULLABLE_STRING
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.PROPERTY_NAME
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.SYMBOL
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.SYMBOLS
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.TO_STRING
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.AMBIGUITY
@@ -22,11 +23,13 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_PARAMETER
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_PROPERTY_TYPE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_RECEIVER_TYPE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.EXPOSED_TYPEALIAS_EXPANDED_TYPE
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.HIDDEN
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ILLEGAL_CONST_EXPRESSION
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ILLEGAL_UNDERSCORE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INAPPLICABLE_CANDIDATE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INCOMPATIBLE_MODIFIERS
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.INFERENCE_ERROR
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NONE_APPLICABLE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.OTHER_ERROR
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSION_IN_IMPLICIT_TYPES
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RECURSION_IN_SUPERTYPES
@@ -48,7 +51,9 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension {
     companion object {
         val MAP = FirDiagnosticFactoryToRendererMap("FIR").also { map ->
             map.put(UNRESOLVED_REFERENCE, "Unresolved reference: {0}", NULLABLE_STRING)
-            map.put(INAPPLICABLE_CANDIDATE, "Inapplicable candidate(s): {0}", SYMBOLS)
+            map.put(HIDDEN, "Symbol {0} is invisible", SYMBOL)
+            map.put(NONE_APPLICABLE, "None of the following functions are applicable: {0}", SYMBOLS)
+            map.put(INAPPLICABLE_CANDIDATE, "Inapplicable candidate(s): {0}", SYMBOL)
             map.put(AMBIGUITY, "Ambiguity between candidates: {0}", SYMBOLS)
             map.put(ASSIGN_OPERATOR_AMBIGUITY, "Ambiguity between assign operator candidates: {0}", SYMBOLS)
             map.put(SYNTAX_ERROR, "Syntax error")
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
index a99b2c31ce1..092f24e9088 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
@@ -14,13 +14,17 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
 object FirDiagnosticRenderers {
     val NULLABLE_STRING = Renderer<String?> { it ?: "null" }
 
+    val SYMBOL = Renderer { symbol: AbstractFirBasedSymbol<*> ->
+        when (symbol) {
+            is FirClassLikeSymbol<*> -> symbol.classId.asString()
+            is FirCallableSymbol<*> -> symbol.callableId.toString()
+            else -> "???"
+        }
+    }
+
     val SYMBOLS = Renderer { symbols: Collection<AbstractFirBasedSymbol<*>> ->
         symbols.joinToString(prefix = "[", postfix = "]", separator = ",", limit = 3, truncated = "...") { symbol ->
-            when (symbol) {
-                is FirClassLikeSymbol<*> -> symbol.classId.asString()
-                is FirCallableSymbol<*> -> symbol.callableId.toString()
-                else -> "???"
-            }
+            SYMBOL.render(symbol)
         }
     }
 
@@ -31,4 +35,4 @@ object FirDiagnosticRenderers {
     val PROPERTY_NAME = Renderer { symbol: FirPropertySymbol ->
         symbol.fir.name.asString()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
index 37e5b6461a3..0a2bb0bfe84 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
@@ -19,7 +19,9 @@ import org.jetbrains.kotlin.psi.*
 
 object FirErrors {
     val UNRESOLVED_REFERENCE by error1<FirSourceElement, PsiElement, String>()
-    val INAPPLICABLE_CANDIDATE by error1<FirSourceElement, PsiElement, Collection<AbstractFirBasedSymbol<*>>>()
+    val HIDDEN by error1<FirSourceElement, PsiElement, AbstractFirBasedSymbol<*>>()
+    val NONE_APPLICABLE by error1<FirSourceElement, PsiElement, Collection<AbstractFirBasedSymbol<*>>>()
+    val INAPPLICABLE_CANDIDATE by error1<FirSourceElement, PsiElement, AbstractFirBasedSymbol<*>>()
     val AMBIGUITY by error1<FirSourceElement, PsiElement, Collection<AbstractFirBasedSymbol<*>>>()
     val ASSIGN_OPERATOR_AMBIGUITY by error1<FirSourceElement, PsiElement, Collection<AbstractFirBasedSymbol<*>>>()
     val SYNTAX_ERROR by error0<FirSourceElement, PsiElement>()
diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
index 131e8588aed..2f163290329 100644
--- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
+++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
@@ -1229,29 +1229,27 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver
     private fun FlowContent.generate(diagnostic: ConeDiagnostic) {
         when (diagnostic) {
             is ConeInapplicableCandidateError -> {
-                for (candidate in diagnostic.candidates) {
-                    describeVerbose(candidate.symbol)
-                    br
-                    candidate.diagnostics.forEach { callDiagnostic ->
-                        when (callDiagnostic) {
-                            is NewConstraintError -> {
-                                ident()
+                describeVerbose(diagnostic.candidateSymbol)
+                br
+                diagnostic.diagnostics.forEach { callDiagnostic ->
+                    when (callDiagnostic) {
+                        is NewConstraintError -> {
+                            ident()
 
-                                generate(callDiagnostic.lowerType as ConeKotlinType)
+                            generate(callDiagnostic.lowerType as ConeKotlinType)
 
-                                ws
-                                span(classes = "subtype-error") { +"<:" }
-                                ws
-                                generate(callDiagnostic.upperType as ConeKotlinType)
-                            }
-                            else -> {
-                                ident()
-                                callDiagnostic::class.qualifiedName?.let { +it }
-                                Unit
-                            }
+                            ws
+                            span(classes = "subtype-error") { +"<:" }
+                            ws
+                            generate(callDiagnostic.upperType as ConeKotlinType)
+                        }
+                        else -> {
+                            ident()
+                            callDiagnostic::class.qualifiedName?.let { +it }
+                            Unit
                         }
-                        br
                     }
+                    br
                 }
             }
             is ConeAmbiguityError -> {
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 7257a27b4f0..313b9c5fed1 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.fir.resolve.calls.*
 import org.jetbrains.kotlin.fir.resolve.calls.tower.FirTowerResolver
 import org.jetbrains.kotlin.fir.resolve.calls.tower.TowerResolveManager
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError
+import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeHiddenCandidateError
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError
 import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedNameError
 import org.jetbrains.kotlin.fir.resolve.inference.ResolvedCallableReferenceAtom
@@ -397,20 +398,24 @@ class FirCallResolver(
                 source,
                 name
             )
-            applicability < CandidateApplicability.SYNTHETIC_RESOLVED -> {
-                val diagnostic = ConeInapplicableCandidateError(
-                    applicability,
-                    candidates.map {
-                        ConeInapplicableCandidateError.CandidateInfo(
-                            it.symbol,
-                            if (it.systemInitialized) it.system.diagnostics else emptyList(),
-                        )
-                    }
-                )
 
-                buildErrorReference(callInfo, diagnostic, source, name)
+            candidates.size > 1 -> buildErrorReference(
+                callInfo,
+                ConeAmbiguityError(name, applicability, candidates.map { it.symbol }),
+                source,
+                name
+            )
+
+            applicability < CandidateApplicability.SYNTHETIC_RESOLVED -> {
+                val candidate = candidates.single()
+                val diagnostic = when (applicability) {
+                    CandidateApplicability.HIDDEN -> ConeHiddenCandidateError(candidate.symbol)
+                    else -> ConeInapplicableCandidateError(applicability, candidate)
+                }
+                buildErrorReference(source, candidate, diagnostic)
             }
-            candidates.size == 1 -> {
+
+            else -> {
                 val candidate = candidates.single()
                 val coneSymbol = candidate.symbol
                 if (coneSymbol is FirBackingFieldSymbol) {
@@ -434,12 +439,6 @@ class FirCallResolver(
                 }
                 FirNamedReferenceWithCandidate(source, name, candidate)
             }
-            else -> buildErrorReference(
-                callInfo,
-                ConeAmbiguityError(name, candidates.map { it.symbol }),
-                source,
-                name
-            )
         }
     }
 
@@ -453,4 +452,15 @@ class FirCallResolver(
         resolutionStageRunner.processCandidate(candidate, stopOnFirstError = false)
         return FirErrorReferenceWithCandidate(source, name, candidate, diagnostic)
     }
+
+    private fun buildErrorReference(
+        source: FirSourceElement?,
+        candidate: Candidate,
+        diagnostic: ConeDiagnostic
+    ): FirErrorReferenceWithCandidate {
+        if (!candidate.fullyAnalyzed) {
+            resolutionStageRunner.processCandidate(candidate, stopOnFirstError = false)
+        }
+        return FirErrorReferenceWithCandidate(source, candidate.callInfo.name, candidate, diagnostic)
+    }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
index aa2f2e7ef60..8d95d0ba856 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Candidate.kt
@@ -115,6 +115,8 @@ class Candidate(
 
     val diagnostics: MutableList<ResolutionDiagnostic> = mutableListOf()
 
+    var passedStages: Int = 0
+
     fun dispatchReceiverExpression(): FirExpression = when (explicitReceiverKind) {
         ExplicitReceiverKind.DISPATCH_RECEIVER, ExplicitReceiverKind.BOTH_RECEIVERS ->
             callInfo.explicitReceiver?.takeIf { it !is FirExpressionStub } ?: FirNoReceiverExpression
@@ -143,3 +145,6 @@ class Candidate(
         return symbol.hashCode()
     }
 }
+
+val Candidate.fullyAnalyzed: Boolean
+    get() = passedStages == callInfo.callKind.resolutionSequence.size
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
index 964e66636db..00fd9035876 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStageRunner.kt
@@ -17,7 +17,9 @@ class ResolutionStageRunner(val components: InferenceComponents) {
         val sink = CheckerSinkImpl(components, stopOnFirstError = stopOnFirstError)
         var finished = false
         sink.continuation = suspend {
-            for (stage in candidate.callInfo.callKind.resolutionSequence) {
+            candidate.callInfo.callKind.resolutionSequence.forEachIndexed { index, stage ->
+                if (index < candidate.passedStages) return@forEachIndexed
+                candidate.passedStages++
                 stage.check(candidate, sink, candidate.callInfo)
             }
         }.createCoroutineUnintercepted(completion = object : Continuation<Unit> {
@@ -38,4 +40,4 @@ class ResolutionStageRunner(val components: InferenceComponents) {
         }
         return sink.current
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TypeArgumentMapping.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TypeArgumentMapping.kt
index ef66400cfb1..6b22dfd778e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TypeArgumentMapping.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/TypeArgumentMapping.kt
@@ -36,8 +36,8 @@ internal object MapTypeArguments : ResolutionStage() {
         if (typeArguments.size == owner.typeParameters.size || callInfo.callKind == CallKind.DelegatingConstructorCall) {
             candidate.typeArgumentMapping = TypeArgumentMapping.Mapped(typeArguments)
         } else {
-            sink.yieldApplicability(CandidateApplicability.INAPPLICABLE)
             candidate.typeArgumentMapping = TypeArgumentMapping.Mapped(emptyList())
+            sink.yieldApplicability(CandidateApplicability.INAPPLICABLE)
         }
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt
index a14ccacc032..9236e2ffb78 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir.resolve.diagnostics
 
 import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic
+import org.jetbrains.kotlin.fir.resolve.calls.Candidate
 import org.jetbrains.kotlin.fir.resolve.calls.CandidateApplicability
 import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
@@ -27,16 +28,27 @@ class ConeUnresolvedNameError(val name: Name) : ConeDiagnostic() {
     override val reason: String get() = "Unresolved name: $name"
 }
 
-class ConeInapplicableCandidateError(
-    val applicability: CandidateApplicability,
-    val candidates: Collection<CandidateInfo>
+class ConeHiddenCandidateError(
+    val candidateSymbol: AbstractFirBasedSymbol<*>
 ) : ConeDiagnostic() {
-    data class CandidateInfo(val symbol: AbstractFirBasedSymbol<*>, val diagnostics: List<KotlinCallDiagnostic>)
-
-    override val reason: String get() = "Inapplicable($applicability): ${candidates.map { describeSymbol(it.symbol) }}"
+    override val reason: String get() = "HIDDEN: ${describeSymbol(candidateSymbol)} is invisible"
 }
 
-class ConeAmbiguityError(val name: Name, val candidates: Collection<AbstractFirBasedSymbol<*>>) : ConeDiagnostic() {
+class ConeInapplicableCandidateError(
+    val applicability: CandidateApplicability,
+    val candidateSymbol: AbstractFirBasedSymbol<*>,
+    val diagnostics: List<KotlinCallDiagnostic>
+) : ConeDiagnostic() {
+    constructor(applicability: CandidateApplicability, candidate: Candidate) : this(
+        applicability,
+        candidate.symbol,
+        candidate.system.diagnostics
+    )
+
+    override val reason: String get() = "Inapplicable($applicability): ${describeSymbol(candidateSymbol)}"
+}
+
+class ConeAmbiguityError(val name: Name, val applicability: CandidateApplicability, val candidates: Collection<AbstractFirBasedSymbol<*>>) : ConeDiagnostic() {
     override val reason: String get() = "Ambiguity: $name, ${candidates.map { describeSymbol(it) }}"
 }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
index a62bb8898d4..1b56c3ec380 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
@@ -180,7 +180,9 @@ class FirCallCompleter(
                 FirBuilderInferenceSession(components, stubsForPostponedVariables as Map<ConeTypeVariable, ConeStubType>)
             }
 
-            val localContext = towerDataContextForAnonymousFunctions.getValue(lambdaArgument.symbol)
+            val localContext = towerDataContextForAnonymousFunctions.get(lambdaArgument.symbol) ?: error(
+                ""
+            )
             transformer.context.withTowerDataContext(localContext) {
                 if (builderInferenceSession != null) {
                     components.inferenceComponents.withInferenceSession(builderInferenceSession) {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
index 62c596b4427..4665342b759 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
@@ -917,7 +917,7 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
                         buildErrorNamedReference {
                             // TODO: add better diagnostic
                             source = augmentedArraySetCall.source
-                            diagnostic = ConeAmbiguityError(operatorName, emptyList())
+                            diagnostic = ConeAmbiguityError(operatorName, CandidateApplicability.RESOLVED, emptyList())
                         }
                     )
                 }
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
index 2fa18ca9642..520fffe2f90 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
@@ -6,9 +6,9 @@ class A() {
 fun f(): Unit {
     var x: Int? = 1
     x = null
-    x <!INAPPLICABLE_CANDIDATE!>+<!> 1
-    x <!INAPPLICABLE_CANDIDATE!>plus<!> 1
-    x <!INAPPLICABLE_CANDIDATE!><<!> 1
+    x <!NONE_APPLICABLE!>+<!> 1
+    x <!NONE_APPLICABLE!>plus<!> 1
+    x <!NONE_APPLICABLE!><<!> 1
     <!UNRESOLVED_REFERENCE!>x += 1<!>
 
     x == 1
@@ -22,7 +22,7 @@ fun f(): Unit {
     x === 1
     x !== 1
 
-    x<!INAPPLICABLE_CANDIDATE!>..<!>2
+    x<!NONE_APPLICABLE!>..<!>2
     x <!INAPPLICABLE_CANDIDATE!>in<!> 1..2
 
     val y : Boolean? = true
diff --git a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.fir.kt b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.fir.kt
index da6e15df17d..08cdb42e71e 100644
--- a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.fir.kt
+++ b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.fir.kt
@@ -5,6 +5,6 @@ fun test() {
     <!INAPPLICABLE_CANDIDATE!>Int<!>()
     <!INAPPLICABLE_CANDIDATE!>Short<!>()
     <!INAPPLICABLE_CANDIDATE!>Byte<!>()
-    <!INAPPLICABLE_CANDIDATE!>Char<!>()
+    <!HIDDEN!>Char<!>()
     <!INAPPLICABLE_CANDIDATE!>Boolean<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.fir.kt b/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.fir.kt
index de7494fcfcb..c067f6bb367 100644
--- a/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.fir.kt
+++ b/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.fir.kt
@@ -40,8 +40,8 @@ class Example {
     var d by CustomDelegate3()
 
     fun test() {
-        requireString(a)
-        requireString(aval)
+        <!INAPPLICABLE_CANDIDATE!>requireString<!>(a)
+        <!INAPPLICABLE_CANDIDATE!>requireString<!>(aval)
         requireString(b)
         requireInt(c)
         requireInt(d)
diff --git a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
index 36926e1421d..9b208538a2a 100644
--- a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
@@ -16,7 +16,7 @@ operator fun String.unaryPlus(): Int = 0
 fun test() {
     requireInt(+ "")
     requireInt(+ Example())
-    requireString(<!INAPPLICABLE_CANDIDATE!>+<!> ExampleDeprecated())
+    <!INAPPLICABLE_CANDIDATE!>requireString<!>(<!INAPPLICABLE_CANDIDATE!>+<!> ExampleDeprecated())
 }
 
 fun requireInt(n: Int) {}
diff --git a/compiler/testData/diagnostics/tests/Nullability.fir.kt b/compiler/testData/diagnostics/tests/Nullability.fir.kt
index ec7997d2a2d..546e69d05d6 100644
--- a/compiler/testData/diagnostics/tests/Nullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/Nullability.fir.kt
@@ -38,7 +38,7 @@ fun test() {
 
   if (out != null && ins != null || out != null) {
     ins?.read();
-    ins.<!INAPPLICABLE_CANDIDATE!>read<!>();
+    ins.<!NONE_APPLICABLE!>read<!>();
     out.println();
   }
 
@@ -114,12 +114,12 @@ fun test() {
   }
   else {
     out?.println();
-    out.<!INAPPLICABLE_CANDIDATE!>println<!>();
+    out.<!NONE_APPLICABLE!>println<!>();
   }
 
   if (out == null || out.println() == Unit) {
     out?.println();
-    out.<!INAPPLICABLE_CANDIDATE!>println<!>();
+    out.<!NONE_APPLICABLE!>println<!>();
   }
   else {
     out.println();
@@ -149,7 +149,7 @@ fun test() {
   
   while (out2 == null) {
     out2?.println();
-    out2.<!INAPPLICABLE_CANDIDATE!>println<!>();
+    out2.<!NONE_APPLICABLE!>println<!>();
   }
   out2.println()
 
diff --git a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
index 963a57289f6..446d0eecf65 100644
--- a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
@@ -1,11 +1,11 @@
 object A1<!CONSTRUCTOR_IN_OBJECT!>()<!> {
-    <!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!INAPPLICABLE_CANDIDATE!>this<!>() {
+    <!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!NONE_APPLICABLE!>this<!>() {
         x + y
     }
 }
 
 object A2 public <!CONSTRUCTOR_IN_OBJECT!>constructor(private val prop: Int)<!> {
-    <!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!INAPPLICABLE_CANDIDATE!>this<!>(x * y) {
+    <!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!NONE_APPLICABLE!>this<!>(x * y) {
         x + y
     }
 }
@@ -19,6 +19,6 @@ val x = object <!CONSTRUCTOR_IN_OBJECT!>(val prop: Int)<!> {
 
 class A3 {
     companion object B<!CONSTRUCTOR_IN_OBJECT!>(val prop: Int)<!> {
-        public <!CONSTRUCTOR_IN_OBJECT!>constructor()<!> : <!INAPPLICABLE_CANDIDATE!>this<!>(2)
+        public <!CONSTRUCTOR_IN_OBJECT!>constructor()<!> : <!NONE_APPLICABLE!>this<!>(2)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.fir.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.fir.kt
index 02b225b0fd2..567a8f4b9b0 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.fir.kt
@@ -19,8 +19,8 @@ fun main() {
     java.lang.System = null
     java.lang.System!!
     System is Int
-    <!INAPPLICABLE_CANDIDATE!>System<!>()
+    <!HIDDEN!>System<!>()
     (System)
     foo@ System
     null <!UNRESOLVED_REFERENCE!>in<!> System
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.fir.kt b/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.fir.kt
index 7c63a2ef936..1d24360337c 100644
--- a/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.fir.kt
+++ b/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.fir.kt
@@ -10,8 +10,8 @@ package outer.p1
 import outer.a
 
 fun use() {
-    <!INAPPLICABLE_CANDIDATE!>a<!>()
-    outer.<!INAPPLICABLE_CANDIDATE!>B<!>()
+    <!HIDDEN!>a<!>()
+    outer.<!HIDDEN!>B<!>()
 }
 
 // FILE: c.kt
@@ -20,6 +20,6 @@ package outer.p1.p2
 import outer.a
 
 fun use() {
-    <!INAPPLICABLE_CANDIDATE!>a<!>()
-    outer.<!INAPPLICABLE_CANDIDATE!>B<!>()
-}
\ No newline at end of file
+    <!HIDDEN!>a<!>()
+    outer.<!HIDDEN!>B<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
index 42ba06bd17d..713b48eea87 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
@@ -4,7 +4,7 @@
 
 fun f1(x: String) {}
 fun f2(f: () -> Unit) {}
-fun test1() = <!INAPPLICABLE_CANDIDATE!>f2<!>(::f1)
+fun test1() = <!INAPPLICABLE_CANDIDATE!>f2<!>(<!UNRESOLVED_REFERENCE!>::f1<!>)
 
 
 @Target(AnnotationTarget.TYPE_PARAMETER,  AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.fir.kt b/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.fir.kt
deleted file mode 100644
index 2061cdfd368..00000000000
--- a/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-fun interface IFoo {
-    fun foo(i: Int)
-}
-
-fun interface IFoo2 : IFoo
-
-object A
-
-operator fun A.get(i: IFoo) = 1
-operator fun A.set(i: IFoo, newValue: Int) {}
-
-fun withVararg(vararg xs: Int) = 42
-
-fun test1() {
-    <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>A[::withVararg]<!> += 1<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.kt b/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.kt
index c012456ffbe..821c47c5809 100644
--- a/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/compatibilityResolveWithVarargAndOperatorCall.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun interface IFoo {
diff --git a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
index cc06049c5b1..baf517a2cdb 100644
--- a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
@@ -19,6 +19,6 @@ fun <K, V> B<K>.star(p: KProperty1<*, V>): B<V> = TODO()
 fun <R : A> B<R>.test(){
     foo(A::bla)
     bar(A::bla)
-    <!INAPPLICABLE_CANDIDATE!>baz<!>(A::bla)
+    <!INAPPLICABLE_CANDIDATE!>baz<!>(<!UNRESOLVED_REFERENCE!>A::bla<!>)
     star(A::bla)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirectionError.fir.kt b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirectionError.fir.kt
index 467dba5dbff..1559616828c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirectionError.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirectionError.fir.kt
@@ -15,5 +15,5 @@ fun <K, V> B<K>.foo(p: KProperty1<K, V>) {}
 class C : A
 
 fun <R : A> B<R>.test(){
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(C::bla)
+    <!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!>C::bla<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
index affb0318308..32bc59ebb43 100644
--- a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
@@ -8,6 +8,6 @@ fun <T> takeIt(x: T, f: SubFunction) {}
 fun cr() {}
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>takeIt<!>(42, ::cr)
+    <!INAPPLICABLE_CANDIDATE!>takeIt<!>(42, <!UNRESOLVED_REFERENCE!>::cr<!>)
     <!INAPPLICABLE_CANDIDATE!>takeIt<!>(42, { })
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
deleted file mode 100644
index cd886eb65e8..00000000000
--- a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.fir.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !WITH_NEW_INFERENCE
-// !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-import kotlin.reflect.*
-
-interface A
-interface B : A
-
-fun A.foo() {}
-
-fun take(f: (A) -> Unit) {}
-fun take(f: () -> Unit) {}
-
-fun test() {
-    B::foo checkType { _<KFunction1<B, Unit>>() }
-
-    <!INAPPLICABLE_CANDIDATE!>take<!>(B::foo)
-}
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
index 4f27d448e65..5de7282208f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.fir.kt
index 64caf41012d..9c4a1d310b3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.fir.kt
@@ -25,7 +25,7 @@ class A {
 
         expectFunction0Unit(::foo)
         expectFunction0String(::foo)
-        <!INAPPLICABLE_CANDIDATE!>expectFunction1Unit<!>(::foo)
-        <!INAPPLICABLE_CANDIDATE!>expectFunction1String<!>(::foo)
+        <!INAPPLICABLE_CANDIDATE!>expectFunction1Unit<!>(<!UNRESOLVED_REFERENCE!>::foo<!>)
+        <!INAPPLICABLE_CANDIDATE!>expectFunction1String<!>(<!UNRESOLVED_REFERENCE!>::foo<!>)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.fir.kt
index 95d19599fb7..7d16ea0ea71 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.fir.kt
@@ -16,15 +16,15 @@ fun <T> bar(s: T) {}
 fun <T> complex(t: T, f: (T) -> Unit) {}
 
 fun test1() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(1, A::invokeLater) // KT-24507 SAM conversion accidentally applied to callable reference and incorrectly handled via BE
+    <!INAPPLICABLE_CANDIDATE!>foo<!>(1, <!UNRESOLVED_REFERENCE!>A::invokeLater<!>) // KT-24507 SAM conversion accidentally applied to callable reference and incorrectly handled via BE
     foo(1, ::bar)
 
     complex(1, ::bar)
 }
 
 fun <R> test2(x: R) {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(x, A::invokeLater) // KT-24507 SAM conversion accidentally applied to callable reference and incorrectly handled via BE
+    <!INAPPLICABLE_CANDIDATE!>foo<!>(x, <!UNRESOLVED_REFERENCE!>A::invokeLater<!>) // KT-24507 SAM conversion accidentally applied to callable reference and incorrectly handled via BE
     foo(x, ::bar)
 
     complex(x, ::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
index 2806859ae53..32246c43e29 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
@@ -14,7 +14,7 @@ fun <T> Wrapper<T>.baz(transform: (T) -> Unit): T = TODO()
 
 fun test() {
     takeFun<String>(::foo)
-    <!INAPPLICABLE_CANDIDATE!>takeFun<!><String>(::fooInt)
+    <!INAPPLICABLE_CANDIDATE!>takeFun<!><String>(<!UNRESOLVED_REFERENCE!>::fooInt<!>)
 
     callFun<String, Wrapper<String>>(::createWrapper)
     callFun<Int, Wrapper<Number>>(::createWrapper)
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
index b2d645d4c59..1fcb1e71a55 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
@@ -23,9 +23,9 @@ fun test1() {
 fun <T> test2() {
     bar<Wrapper, Int, String>(Wrapper::fooReturnString).checkType { _<Tripple<Wrapper, Int, String>>() }
     bar<Wrapper, T, String>(Wrapper::fooReturnString).checkType { _<Tripple<Wrapper, T, String>>() }
-    <!INAPPLICABLE_CANDIDATE!>bar<!><Wrapper, T, T>(Wrapper::fooReturnString)
-    <!INAPPLICABLE_CANDIDATE!>bar<!><Wrapper, Int, Int>(Wrapper::fooReturnString)
+    <!INAPPLICABLE_CANDIDATE!>bar<!><Wrapper, T, T>(<!UNRESOLVED_REFERENCE!>Wrapper::fooReturnString<!>)
+    <!INAPPLICABLE_CANDIDATE!>bar<!><Wrapper, Int, Int>(<!UNRESOLVED_REFERENCE!>Wrapper::fooReturnString<!>)
 
     bar<Wrapper, Int, T>(Wrapper::fooTakeInt).checkType { _<Tripple<Wrapper, Int, T>>() }
     bar<Wrapper, Int, String>(Wrapper::fooTakeInt).checkType { _<Tripple<Wrapper, Int, String>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/genericCallWithReferenceAgainstVararg.fir.kt b/compiler/testData/diagnostics/tests/callableReference/genericCallWithReferenceAgainstVararg.fir.kt
index e63a47a9cbb..b904f79d1e3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/genericCallWithReferenceAgainstVararg.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/genericCallWithReferenceAgainstVararg.fir.kt
@@ -5,9 +5,9 @@ fun foo(vararg ints: Int) {}
 fun test(i: IntArray) {
     myLet(i, ::foo)
     myLet(::foo)
-    <!INAPPLICABLE_CANDIDATE!>myLet<!><Int>(::foo)
+    <!INAPPLICABLE_CANDIDATE!>myLet<!><Int>(<!UNRESOLVED_REFERENCE!>::foo<!>)
     myLet<IntArray>(::foo)
-    <!INAPPLICABLE_CANDIDATE!>myLetExplicit1<!>(::foo)
+    <!INAPPLICABLE_CANDIDATE!>myLetExplicit1<!>(<!UNRESOLVED_REFERENCE!>::foo<!>)
     myLetExplicit2(::foo)
 }
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.fir.kt b/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.fir.kt
index 6b813f4e609..c3bd1b383a6 100644
--- a/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.fir.kt
@@ -12,7 +12,7 @@ fun allOfTheAbove(f: (A) -> Unit): Any = f
 
 fun test() {
     coercionToUnit(A::foo)
-    <!INAPPLICABLE_CANDIDATE!>varargToElement<!>(A::foo)
+    <!INAPPLICABLE_CANDIDATE!>varargToElement<!>(<!UNRESOLVED_REFERENCE!>A::foo<!>)
     defaultAndVararg(A::foo)
     allOfTheAbove(A::foo)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
index 92fbfedf7be..6522f5d262c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
@@ -11,9 +11,9 @@ class Foo {
     }
 
     fun foo() {
-        <!INAPPLICABLE_CANDIDATE!>installRoute<!><Any>(::route)
+        <!NONE_APPLICABLE!>installRoute<!><Any>(::route)
     }
 
 }
 
-fun route(s: String): Any? = null
\ No newline at end of file
+fun route(s: String): Any? = null
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/kt35887_simple.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/kt35887_simple.fir.kt
index f3aea568a45..f70a9b5d307 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/kt35887_simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/kt35887_simple.fir.kt
@@ -6,4 +6,4 @@ import kotlin.reflect.KProperty0
 object A
 
 fun <TProperty> property0(property: KProperty0<TProperty>) = A
-val <K> K.key get() : A = <!INAPPLICABLE_CANDIDATE!>property0<!>(Map.Entry<K, *>::key) // should be forbidden
+val <K> K.key get() : A = <!INAPPLICABLE_CANDIDATE!>property0<!>(<!UNRESOLVED_REFERENCE!>Map.Entry<K, *>::key<!>) // should be forbidden
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.fir.kt
index 563f1fdc365..45505c9a927 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.fir.kt
@@ -11,6 +11,6 @@ fun <T> baz(e: T, f: (T) -> Unit) {}
 
 fun test(a: A, b: B) {
     // Note that diagnostic is always on callable references as they are resolved after simple arguments
-    <!INAPPLICABLE_CANDIDATE!>baz<!>(a, ::fooB)
-    <!INAPPLICABLE_CANDIDATE!>bar<!>(::fooB, a)
-}
\ No newline at end of file
+    <!INAPPLICABLE_CANDIDATE!>baz<!>(a, <!UNRESOLVED_REFERENCE!>::fooB<!>)
+    <!INAPPLICABLE_CANDIDATE!>bar<!>(<!UNRESOLVED_REFERENCE!>::fooB<!>, a)
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt
index 9ec54a74492..8fffcbe4ad4 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveTwoReferencesAgainstGenerics.fir.kt
@@ -3,8 +3,8 @@
 // WITH_RUNTIME
 
 
-fun <T> List<Option<T>>.flatten(): List<T> = <!AMBIGUITY!>flatMap<!> { <!UNRESOLVED_REFERENCE!>it<!>.<!INAPPLICABLE_CANDIDATE!>fold<!>(::emptyList, <!UNRESOLVED_REFERENCE!>::listOf<!>) }
+fun <T> List<Option<T>>.flatten(): List<T> = <!AMBIGUITY!>flatMap<!> { <!UNRESOLVED_REFERENCE!>it<!>.<!NONE_APPLICABLE!>fold<!>(::emptyList, <!UNRESOLVED_REFERENCE!>::listOf<!>) }
 
 class Option<out T> {
     fun <R> fold(ifEmpty: () -> R, ifSome: (T) -> R): R = TODO()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
index e40440c30dd..3182eec3a07 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
@@ -58,7 +58,7 @@ fun main() {
     val x1 = joinT(1, "2")
     checkSubtype<String?>(x1)
     val x2 = <!INAPPLICABLE_CANDIDATE!>joinT<!>(*1, "2")
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><String?>(x2)
+    checkSubtype<String?>(x2)
     val x6 = joinT(1, *a)
     checkSubtype<String?>(x6)
     val x7 = joinT(1, *a, "3")
@@ -93,4 +93,4 @@ fun <T> joinG(x : Int, vararg a : T) : String {
 
 fun <T: Any> joinT(x : Int, vararg a : T) : T? {
     return null
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
index f3502cbdb5a..ae8211a85f7 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
@@ -9,9 +9,9 @@ fun bar(a: Any) {}
 fun bar(a: Int) {}
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(1, 2)
+    <!NONE_APPLICABLE!>foo<!>(1, 2)
     <!INAPPLICABLE_CANDIDATE!>foo<!>("")
 
-    <!INAPPLICABLE_CANDIDATE!>bar<!>(1, 2)
-    <!INAPPLICABLE_CANDIDATE!>bar<!>()
-}
\ No newline at end of file
+    <!NONE_APPLICABLE!>bar<!>(1, 2)
+    <!NONE_APPLICABLE!>bar<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.fir.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.fir.kt
index 7e4d7e0d267..d9f4b9a1864 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.fir.kt
@@ -2,7 +2,7 @@ package foo
 
 fun test() {
   A.d
-  A.Companion.<!INAPPLICABLE_CANDIDATE!>f<!>
+  A.Companion.f
   B.D
   CCC
   CCC.classObjectVar
@@ -27,4 +27,4 @@ class CCC() {
   private companion object {
     val classObjectVar = 3
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.fir.kt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.fir.kt
index 5a029292302..73796dc8b0e 100644
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.fir.kt
@@ -10,6 +10,6 @@ class A {
     }
 }
 
-fun f1() = A.<!INAPPLICABLE_CANDIDATE!>Companion<!>.<!UNRESOLVED_REFERENCE!>B<!>.<!UNRESOLVED_REFERENCE!>C<!>
+fun <!EXPOSED_FUNCTION_RETURN_TYPE!>f1<!>() = A.Companion.B.C
 
-fun f2() = A.<!INAPPLICABLE_CANDIDATE!>Companion<!>.<!UNRESOLVED_REFERENCE!>B<!>.<!UNRESOLVED_REFERENCE!>C<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
\ No newline at end of file
+fun f2() = A.Companion.B.C.foo()
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.fir.kt
index b76c4504f2f..ed776614370 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.fir.kt
@@ -7,5 +7,5 @@ class Foo {
         x = "Foo"
     }
 
-    constructor(x: String, y: String): <!INAPPLICABLE_CANDIDATE!>this<!>(y.hashCode())
-}
\ No newline at end of file
+    constructor(x: String, y: String): <!NONE_APPLICABLE!>this<!>(y.hashCode())
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.fir.kt
index b7ff32fb78a..8c7dc98fa97 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.fir.kt
@@ -9,7 +9,7 @@ fun test() {
     // Error
     container.<!INAPPLICABLE_CANDIDATE!>iterator<!>()
     // for extension iterator, this code compiles, but should not
-    <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in container) {}<!>
+    <!INAPPLICABLE_CANDIDATE!>for (s in container) {}<!>
 }
 class OtherContainer<K>(val k: K) {
     operator fun iterator(): Iterator<K> = null!!
@@ -18,5 +18,5 @@ class OtherContainer<K>(val k: K) {
 fun test2() {
     val other: OtherContainer<String>? = null
     // Error
-    <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in other) {}<!>
+    <!INAPPLICABLE_CANDIDATE!>for (s in other) {}<!>
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.fir.kt
index 596d3d773b3..5f4acc078ec 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.fir.kt
@@ -8,9 +8,9 @@ class It {
 }
 
 fun test(c: Coll?) {
-  <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (x in c) {}<!>
+  <!INAPPLICABLE_CANDIDATE!>for (x in c) {}<!>
 
   if (c != null) {
     for(x in c) {}
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.fir.kt b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.fir.kt
index c97b7f0dab6..3ede29e6027 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.fir.kt
@@ -2,5 +2,5 @@ fun f(a: Boolean, b: Int) {}
 
 fun foo(a: Any) {
     <!INAPPLICABLE_CANDIDATE!>f<!>(a is Int, a)
-    1 <!INAPPLICABLE_CANDIDATE!>+<!> a
-}
\ No newline at end of file
+    1 <!NONE_APPLICABLE!>+<!> a
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
index 42202be3f09..991fc0fe076 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
@@ -5,7 +5,7 @@ fun foo(block: () -> (() -> Int)) {}
 
 fun test() {
     val x = <!EXPRESSION_REQUIRED!>fun named1(x: Int): Int { return 1 }<!>
-    x <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Function1<Int, Int>>() }
+    x <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Function1<Int, Int>>() }
 
     foo { fun named2(): Int {return 1} }
     foo({ fun named3() = 1 })
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
index 6e5547829ff..7ad8d8e86df 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
@@ -5,7 +5,7 @@
 import kotlin.reflect.KProperty
 
 class B {
-    val c by <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>Delegate<!>(<!UNRESOLVED_REFERENCE!>ag<!>)<!>
+    val c by <!INAPPLICABLE_CANDIDATE!><!INAPPLICABLE_CANDIDATE!>Delegate<!>(<!UNRESOLVED_REFERENCE!>ag<!>)<!>
 }
 
 class Delegate<T: Any>(val init: T) {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.fir.kt
index 811a7263d03..86c404b813b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.fir.kt
@@ -5,7 +5,7 @@ import kotlin.reflect.KProperty
 val Int.a by Delegate(this)
 
 class A {
-  val Int.a by <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>Delegate<!>(this)<!>
+  val Int.a by <!INAPPLICABLE_CANDIDATE!>Delegate<!>(this)
 }
 
 class Delegate(i: Int) {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.fir.kt
index 7d9c4fed52b..d7a9c9067f1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.fir.kt
@@ -3,7 +3,7 @@
 import kotlin.reflect.KProperty
 
 class A {
-    val c: Int by <!INAPPLICABLE_CANDIDATE!>Delegate()<!>
+    val c: Int by <!NONE_APPLICABLE!>Delegate()<!>
 }
 
 class Delegate {
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
index 5a4a7138942..4e839cc1292 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
@@ -20,7 +20,7 @@ fun test(i: Int?) {
     <!INAPPLICABLE_CANDIDATE!>foo<!>(l4@ "")
     <!INAPPLICABLE_CANDIDATE!>foo<!>((""))
     foo(<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(""))
-    foo(<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(""))
+    <!INAPPLICABLE_CANDIDATE!>foo<!>(<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(""))
     
     use(a, b, c, d)
 }
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.fir.kt b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.fir.kt
index 75cf307e6b5..fe4ce752d1a 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.fir.kt
+++ b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.fir.kt
@@ -21,15 +21,15 @@ import p.*
 
 class K: J.C() {
     fun dynamic.test() {
-        <!INAPPLICABLE_CANDIDATE!>sam<!>(null)
-        <!INAPPLICABLE_CANDIDATE!>sam<!>(
+        <!HIDDEN!>sam<!>(null)
+        <!HIDDEN!>sam<!>(
             name = null,
             name = null
         )
     }
 
     fun test() {
-        <!INAPPLICABLE_CANDIDATE!>sam<!>(null)
+        <!HIDDEN!>sam<!>(null)
     }
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.fir.kt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.fir.kt
index 0701f5ccc4f..9057e9a5eee 100644
--- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.fir.kt
+++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.fir.kt
@@ -6,5 +6,5 @@ enum class A(val c: Int) {
 
 fun createA(): A {
     // Error should be here!
-    return <!INAPPLICABLE_CANDIDATE!>A<!>(10)
+    return <!HIDDEN!>A<!>(10)
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.fir.kt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.fir.kt
index 937cb42fbfe..21db81335c6 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.fir.kt
@@ -8,6 +8,6 @@ open enum class MyEnum() {
 
 enum class MyEnum2() {}
 
-class MyClass(): <!INAPPLICABLE_CANDIDATE!>MyEnum2<!>() {}
+class MyClass(): <!HIDDEN!>MyEnum2<!>() {}
 
 class MyClass2(): <!UNRESOLVED_REFERENCE!>MyJavaEnum<!>() {}
diff --git a/compiler/testData/diagnostics/tests/exposed/exceptionOnFakeInvisible.fir.kt b/compiler/testData/diagnostics/tests/exposed/exceptionOnFakeInvisible.fir.kt
index bba58b45e5f..7b653470296 100644
--- a/compiler/testData/diagnostics/tests/exposed/exceptionOnFakeInvisible.fir.kt
+++ b/compiler/testData/diagnostics/tests/exposed/exceptionOnFakeInvisible.fir.kt
@@ -7,6 +7,6 @@ fun bar(arg: String) = arg
 class Derived : Base("123") {
 
     private inline fun foo() {
-        bar(<!INAPPLICABLE_CANDIDATE!>v<!>)
+        bar(<!HIDDEN!>v<!>)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt b/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
index ceffdebe20a..3736d3d3ee2 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/kt1875.fir.kt
@@ -16,6 +16,6 @@ fun test(t: T) {
 fun test1(t: T?) {
     t.<!UNRESOLVED_REFERENCE!>f<!>(1) // todo resolve f as value and report UNSAFE_CALL
     t?.<!INAPPLICABLE_CANDIDATE!>f<!>(1)
-    t.<!INAPPLICABLE_CANDIDATE!>f<!>?.<!UNRESOLVED_REFERENCE!>invoke<!>(1)
+    t.<!INAPPLICABLE_CANDIDATE!>f<!>?.invoke(1)
     t?.f?.invoke(1)
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
index 11a8998209f..5a90d6d1d9e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
@@ -10,8 +10,8 @@ fun <X, Y> foo(y: Y, x: (X, Y) -> Unit) {}
 fun bar(aInstance: A, bInstance: B) {
     foo("") {
         (<!UNRESOLVED_REFERENCE!>a<!>, <!UNRESOLVED_REFERENCE!>b<!>): A, c ->
-        a <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        a <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<String>() }
     }
 
@@ -24,24 +24,24 @@ fun bar(aInstance: A, bInstance: B) {
 
     foo(bInstance) {
         (a, b): A, (c, d) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<Double>() }
         d checkType { _<Short>() }
     }
 
     foo(bInstance) {
         (a, b), (c, d) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<Double>() }
         d checkType { _<Short>() }
     }
 
     foo<A, B>(bInstance) {
         (a, b), (c, d) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<Double>() }
         d checkType { _<Short>() }
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
index 3b39223d348..d7af54b0415 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
@@ -5,22 +5,22 @@ data class A(val x: Int, val y: String)
 
 fun bar() {
     val x = { (<!UNRESOLVED_REFERENCE!>a<!>, <!UNRESOLVED_REFERENCE!>b<!>): A ->
-        a <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        a <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     }
 
     x checkType { _<(A) -> Unit>() }
 
     val y = { (<!UNRESOLVED_REFERENCE!>a: Int<!>, <!UNRESOLVED_REFERENCE!>b<!>): A ->
         a checkType { _<Int>() }
-        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     }
 
     y checkType { _<(A) -> Unit>() }
 
     val y2 = { (<!UNRESOLVED_REFERENCE!>a: Number<!>, <!UNRESOLVED_REFERENCE!>b<!>): A ->
         a checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
-        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        b <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     }
 
     y2 checkType { _<(A) -> Unit>() }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
index 61c556743b3..9b4ea9d4756 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
@@ -23,7 +23,7 @@ fun bar() {
     }
 
     foo { (a, b), (c, b) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
         b checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { <!INAPPLICABLE_CANDIDATE!>_<!><B>() }
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
index e7e9af3047b..41783ca7cee 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
@@ -36,8 +36,8 @@ fun bar() {
     }
 
     foobar { (a, b), (c, d) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<Double>() }
         d checkType { _<Short>() }
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/unusedParameters.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/unusedParameters.fir.kt
index b2de6659aee..db23c7d5f31 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/unusedParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/unusedParameters.fir.kt
@@ -32,12 +32,12 @@ fun bar() {
     }
 
     foobar { (a, b), (c, d) ->
-        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        <!UNRESOLVED_REFERENCE!>a<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
         d checkType { _<Short>() }
     }
 
     foobar { (a, b), (c, d) ->
-        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!UNRESOLVED_REFERENCE!>b<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
         c checkType { _<Double>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
index 4b06fd6d4b4..0f218668cf2 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClasses.fir.kt
@@ -20,7 +20,7 @@ class A : Outer<Double, Short>() {
 
 fun foo() {
     Derived().foo() checkType { _<Outer<String, Int>.Inner<Char>>() }
-    Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<Char, String>>() }
+    Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Map<Char, String>>() }
     A.B().bar() checkType { _<Outer<Float, Long>.Inner<String>>() }
-    A.B().x() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<String, Float>>() }
+    A.B().x() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Map<String, Float>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
index f4db464a50c..bcb0aa6dfa0 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
@@ -43,7 +43,7 @@ fun test() {
     x = foobar<String>()
 
     x().foo().a() checkType { <!INAPPLICABLE_CANDIDATE!>_<!><A<String, Double, Short, Long>>() }
-    x().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><A<String, Double, Short, Char>>() }
+    x().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><A<String, Double, Short, Char>>() }
 
     x = foobar<Int>()
 
@@ -51,5 +51,5 @@ fun test() {
     y = noParameters()
 
     y().foo().a() checkType { _<A<Any, Double, Short, Long>>() }
-    y().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><A<Any, Double, Short, Char>>() }
+    y().bar() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><A<Any, Double, Short, Char>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
index 2cbb09b91cd..1ea8a5ee22e 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesTransitive.fir.kt
@@ -15,5 +15,5 @@ class Derived : BaseDerived2<Int>() {
 
 fun foo() {
     Derived().foo() checkType { _<Outer<Int, String>.Inner<Char>>() }
-    Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Map<Char, Int>>() }
+    Derived().baz() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Map<Char, Int>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
index 6a1b212e577..e02c42140fd 100644
--- a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
@@ -5,12 +5,12 @@ fun myFun(i : String) {}
 fun myFun(i : Int) {}
 
 fun test1() {
-    <!INAPPLICABLE_CANDIDATE!>myFun<!><Int>(3)
-    <!INAPPLICABLE_CANDIDATE!>myFun<!><String>('a')
+    <!NONE_APPLICABLE!>myFun<!><Int>(3)
+    <!NONE_APPLICABLE!>myFun<!><String>('a')
 }
 
 fun test2() {
     val m0 = java.util.HashMap()
     val m1 = java.util.<!INAPPLICABLE_CANDIDATE!>HashMap<!><String, String, String>()
     val m2 = java.util.<!INAPPLICABLE_CANDIDATE!>HashMap<!><String>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.fir.kt b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.fir.kt
index bd143fb16da..46bc2d36099 100644
--- a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.fir.kt
@@ -22,24 +22,24 @@ import j.JavaProtected
 import j.JavaPackageLocal
 
 class A {
-    val p1 = JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaPPackage<!>
-    val p2 = JavaProtected.<!INAPPLICABLE_CANDIDATE!>javaPProtectedStatic<!>
-    val p3 = JavaProtected().<!INAPPLICABLE_CANDIDATE!>javaPProtectedPackage<!>
+    val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
+    val p2 = JavaProtected.<!HIDDEN!>javaPProtectedStatic<!>
+    val p3 = JavaProtected().<!HIDDEN!>javaPProtectedPackage<!>
 
     fun test() {
-        JavaProtected.<!INAPPLICABLE_CANDIDATE!>javaMProtectedStatic<!>()
-        JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaMPackage<!>()
+        JavaProtected.<!HIDDEN!>javaMProtectedStatic<!>()
+        JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
     }
 }
 
 class B : JavaProtected() {
-    val p1 = JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaPPackage<!>
+    val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
     val p2 = JavaProtected.javaPProtectedStatic
     val p3 = javaPProtectedPackage
 
     fun test() {
         JavaProtected.javaMProtectedStatic()
-        JavaPackageLocal.<!INAPPLICABLE_CANDIDATE!>javaMPackage<!>()
+        JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
     }
 }
 
@@ -59,4 +59,4 @@ class C {
         JavaProtected.javaMProtectedStatic()
         JavaPackageLocal.javaMPackage()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
index 9e93dd8d3d1..05e1b395148 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
@@ -27,9 +27,9 @@ import k.two
 import k.all
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>zero<!>()
-    <!INAPPLICABLE_CANDIDATE!>zero<!>(1)
-    <!INAPPLICABLE_CANDIDATE!>zero<!>("")
+    <!NONE_APPLICABLE!>zero<!>()
+    <!NONE_APPLICABLE!>zero<!>(1)
+    <!NONE_APPLICABLE!>zero<!>("")
 
     one()
     <!INAPPLICABLE_CANDIDATE!>one<!>(1)
@@ -42,4 +42,4 @@ fun test() {
     all()
     all(1)
     all("")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.fir.kt
index 434a8a9cf82..f7340913f57 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.fir.kt
@@ -29,9 +29,9 @@ private object TopLevelObject {
 }
 
 fun testAccess() {
-    <!INAPPLICABLE_CANDIDATE!>NestedClass<!>()
+    <!HIDDEN!>NestedClass<!>()
     E1
     InNested()
     NestedEntry
     inObject()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.fir.kt b/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.fir.kt
index cc97cecd2eb..a44cf851515 100644
--- a/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/InaccessiblePrivateClass.fir.kt
@@ -15,4 +15,4 @@ package p1
 import p2.*
 
 val <!EXPOSED_PROPERTY_TYPE!>x<!>: X = X()
-val <!EXPOSED_PROPERTY_TYPE!>y<!>: Y = <!INAPPLICABLE_CANDIDATE!>Y<!>()
+val <!EXPOSED_PROPERTY_TYPE!>y<!>: Y = <!HIDDEN!>Y<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.fir.kt b/compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.fir.kt
index a5592ef7931..c3cc649331a 100644
--- a/compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.fir.kt
@@ -14,4 +14,4 @@ package a
 import pack1.*
 import pack2.*
 
-class X : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>SomeClass<!>()
+class X : <!EXPOSED_SUPER_CLASS, HIDDEN!>SomeClass<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.fir.kt b/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.fir.kt
index 20803950834..f939d2e39be 100644
--- a/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.fir.kt
@@ -8,4 +8,4 @@ package a
 
 import pack1.*
 
-private class X : <!INAPPLICABLE_CANDIDATE!>SomeClass<!>()
\ No newline at end of file
+private class X : <!HIDDEN!>SomeClass<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.fir.kt b/compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.fir.kt
index f65626c3aa4..f522cf7c968 100644
--- a/compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.fir.kt
@@ -17,5 +17,5 @@ package a
 import pack1.SomeClass.*
 import pack2.*
 
-class X : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>N<!>()
+class X : <!EXPOSED_SUPER_CLASS, HIDDEN!>N<!>()
 class Y : PublicNested()
diff --git a/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.fir.kt b/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.fir.kt
index a6fda12428f..ffd7e80ca90 100644
--- a/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.fir.kt
@@ -11,4 +11,4 @@ package a
 
 import pack1.SomeClass.*
 
-private class X : <!INAPPLICABLE_CANDIDATE!>N<!>()
\ No newline at end of file
+private class X : <!HIDDEN!>N<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.fir.kt b/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.fir.kt
index 1f21b6bb9aa..d78ec9bf63b 100644
--- a/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.fir.kt
@@ -3,7 +3,7 @@
 import B.foo
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>
+    <!HIDDEN!>foo<!>
 }
 
 // FILE: B.kt
@@ -13,4 +13,4 @@ object B : C<String>()
 
 open class C<T> {
     private var foo: String = "abc"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.fir.kt
deleted file mode 100644
index 96dadd79db6..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package c
-
-fun demo() {
-    val bar = 51
-    fun map(f : <!SYNTAX!><!SYNTAX!><!>fun<!>
-    val foo = 3;
-    bar <!INAPPLICABLE_CANDIDATE!>+<!> map { foo }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt
index b4a2738c553..fb97a97e798 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package c
 
 fun demo() {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.fir.kt
index 0d63fefe59b..b7159000e84 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.fir.kt
@@ -14,7 +14,7 @@ fun x(f : Foo) {
 
     f.<!UNRESOLVED_REFERENCE!>a<!>()
     <!UNRESOLVED_REFERENCE!>c<!>()
-    <!INAPPLICABLE_CANDIDATE!>R<!>()
+    <!HIDDEN!>R<!>()
 }
 
-object R {}
\ No newline at end of file
+object R {}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.fir.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.fir.kt
index ae5b852f858..b31d5a847c2 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.fir.kt
@@ -4,5 +4,5 @@ fun <T> f(i: Int, t: T, c: MutableCollection<T>) {}
 fun <T> f(a: Any, t: T, l: MutableList<T>) {}
 
 fun test(l: List<Int>) {
-    <!INAPPLICABLE_CANDIDATE!>f<!>(1, "", l)
+    <!NONE_APPLICABLE!>f<!>(1, "", l)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
index 177d1f8c10f..43ee1c7910f 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
@@ -5,10 +5,10 @@ fun <T : Any> Array<T?>.filterNotNull(): List<T> = throw Exception()
 
 fun test1(a: Array<out Int?>) {
     val list = a.<!INAPPLICABLE_CANDIDATE!>filterNotNull<!>()
-    list <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
+    list checkType { _<List<Int>>() }
 }
 
 fun test2(vararg a: Int?) {
     val list = a.<!INAPPLICABLE_CANDIDATE!>filterNotNull<!>()
-    list <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
-}
\ No newline at end of file
+    list checkType { <!INAPPLICABLE_CANDIDATE!>_<!><List<Int>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.fir.kt
index b0672c7516a..ef490e8875a 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.fir.kt
@@ -2,10 +2,10 @@ interface Inv<T>
 
 fun <Y: X, X : Inv<out String>> foo(x: X, y: Y) {
     val rX = <!INAPPLICABLE_CANDIDATE!>bar<!>(x)
-    rX.<!UNRESOLVED_REFERENCE!>length<!>
+    rX.length
 
     val rY = <!INAPPLICABLE_CANDIDATE!>bar<!>(y)
-    rY.<!UNRESOLVED_REFERENCE!>length<!>
+    rY.length
 }
 
-fun <Y> bar(l: Inv<Y>): Y = TODO()
\ No newline at end of file
+fun <Y> bar(l: Inv<Y>): Y = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
index 6888e73ef5e..2977fc13931 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
@@ -3,5 +3,5 @@ fun <T> Array<T>.foo() {}
 
 fun test(array: Array<out Int>) {
     array.foo()
-    array.<!INAPPLICABLE_CANDIDATE!>foo<!><out Int>()
-}
\ No newline at end of file
+    array.<!INAPPLICABLE_CANDIDATE!>foo<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out Int<!>>()
+}
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
index a63377b4fdb..7848dde3efe 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
@@ -12,6 +12,6 @@ fun <T: Any> joinT(x: Comparable<*>, y: T): T? {
 }
 
 fun test() {
-    val x2 = <!INAPPLICABLE_CANDIDATE!>joinT<!>(Unit, "2")
+    val x2 = <!NONE_APPLICABLE!>joinT<!>(Unit, "2")
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><String?>(x2)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.fir.kt b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.fir.kt
index 64feed39415..363d4dd8d6c 100644
--- a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.fir.kt
@@ -119,8 +119,8 @@ fun main() {
      * K <: (A) -> Unit -> TypeVariable(_RP1) >: A
      * K >: (C) -> TypeVariable(_R) -> TypeVariable(_RP1) <: C
      */
-    val x12 = <!INAPPLICABLE_CANDIDATE!>selectC<!>(id { <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved name: it"), UNRESOLVED_REFERENCE!>it<!> }, id { x: B -> })
-    val x13 = <!INAPPLICABLE_CANDIDATE!>selectA<!>(id { <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved name: it"), UNRESOLVED_REFERENCE!>it<!> }, id { x: C -> })
+    val x12 = <!INAPPLICABLE_CANDIDATE!>selectC<!>(id { <!DEBUG_INFO_EXPRESSION_TYPE("C")!>it<!> }, id { x: B -> })
+    val x13 = <!INAPPLICABLE_CANDIDATE!>selectA<!>(id { <!DEBUG_INFO_EXPRESSION_TYPE("A")!>it<!> }, id { x: C -> })
     val x14 = selectC(id { <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Unresolved name: it"), UNRESOLVED_REFERENCE!>it<!> }, id { x: A -> }, { x -> x })
     val x15 = selectC(id { <!DEBUG_INFO_EXPRESSION_TYPE("C")!>it<!> }, { x: A -> }, id { x -> x })
     /*
@@ -152,7 +152,7 @@ fun main() {
     select(id(fun String.(x: String) {}), id(fun(x: String, y: String) { }), { x: String, y: String -> x })
     // Convert to extension lambda is impossible because the lambda parameter types aren't specified explicitly
     select(id(fun String.(x: String) {}), id(fun(x: String, y: String) { }), { x, y -> x })
-    <!INAPPLICABLE_CANDIDATE!>select<!>(<!INAPPLICABLE_CANDIDATE!>id<!>(id(fun(x: String, y: String) { }), fun String.(x: String) {}), { x, y -> x })
+    select(<!INAPPLICABLE_CANDIDATE!>id<!>(id(fun(x: String, y: String) { }), fun String.(x: String) {}), { x, y -> x })
     val x26: Int.(String) -> Int = fun (x: String) = 10 // it must be error, see KT-38439
     // Receiver must be specified in anonymous function declaration
     val x27: Int.(String) -> Int = id(fun (x: String) = 10)
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
index b77422491e4..04d68257dba 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
@@ -3,7 +3,7 @@ package c
 
 import java.util.ArrayList
 
-fun Array<Int>.toIntArray(): IntArray = this.<!INAPPLICABLE_CANDIDATE!>mapTo<!>(IntArray(size), {<!UNRESOLVED_REFERENCE!>it<!>})
+fun Array<Int>.toIntArray(): IntArray = this.<!INAPPLICABLE_CANDIDATE!>mapTo<!>(IntArray(size), {it})
 
 fun Array<Int>.toArrayList(): ArrayList<Int> = this.mapTo(ArrayList<Int>(size), {it})
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt39220.fir.kt b/compiler/testData/diagnostics/tests/inference/kt39220.fir.kt
index c54578acf32..30954aabfef 100644
--- a/compiler/testData/diagnostics/tests/inference/kt39220.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt39220.fir.kt
@@ -114,14 +114,14 @@ fun <T : Foo, R: Number, D: Int> main() {
     bar7(Foo::resolve) // OK
 
     // with LHS and sentension function expected type
-    <!INAPPLICABLE_CANDIDATE!>bar10<!><D>(Int::x1) // ERROR before the fix in NI
+    <!INAPPLICABLE_CANDIDATE!>bar10<!><D>(<!UNRESOLVED_REFERENCE!>Int::x1<!>) // ERROR before the fix in NI
     bar10<Int>(Int::x1) // OK
     bar10(Int::x1) // OK
 
     fun Int.ext() {
         // with LHS and sentension function expected type
-        <!INAPPLICABLE_CANDIDATE!>bar10<!><D>(::x1) // ERROR before the fix in NI
-        <!INAPPLICABLE_CANDIDATE!>bar10<!><Int>(::x1) // OK
-        <!INAPPLICABLE_CANDIDATE!>bar10<!>(::x1) // OK
+        <!INAPPLICABLE_CANDIDATE!>bar10<!><D>(<!UNRESOLVED_REFERENCE!>::x1<!>) // ERROR before the fix in NI
+        <!INAPPLICABLE_CANDIDATE!>bar10<!><Int>(<!UNRESOLVED_REFERENCE!>::x1<!>) // OK
+        <!INAPPLICABLE_CANDIDATE!>bar10<!>(<!UNRESOLVED_REFERENCE!>::x1<!>) // OK
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
index 0c05a63971e..ce7dd68d053 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
@@ -5,21 +5,21 @@ import java.lang.Exception
 fun <K> id(arg: K): K = arg
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)!!
+    id(<!UNRESOLVED_REFERENCE!>unresolved<!>)!!
     <!UNRESOLVED_REFERENCE!>unresolved<!>!!!!
     try {
-        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     } catch (e: Exception) {
-        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     }
 
     if (true)
-        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     else
-        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
 
     when {
         true -> <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     }
-    <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>) ?: <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    id(<!UNRESOLVED_REFERENCE!>unresolved<!>) ?: id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
index 2fedc1e6b87..15e81b3b1f5 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
@@ -10,4 +10,4 @@ fun <T, Q> List<T>.map1(f: (T)-> Q): List<T>? = tail!!.map1(f)
 
 fun <T, Q> List<T>.map2(f: (T)-> Q): List<T>? = tail.sure().map2(f)
 
-fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = tail.<!INAPPLICABLE_CANDIDATE!>sure<!><T>().map3(f)
\ No newline at end of file
+fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = tail.<!INAPPLICABLE_CANDIDATE!>sure<!><T>().<!INAPPLICABLE_CANDIDATE!>map3<!>(f)
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.fir.kt
index 15f474ac9b4..d55f3fad5a9 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.fir.kt
@@ -1,8 +1,8 @@
 fun test() {
-    val a = <!INAPPLICABLE_CANDIDATE!>-<!>false
+    val a = <!NONE_APPLICABLE!>-<!>false
 }
 
 operator fun A.unaryMinus() {}
 operator fun B.unaryMinus() {}
 class A
-class B
\ No newline at end of file
+class B
diff --git a/compiler/testData/diagnostics/tests/inference/tooEagerSmartcast.fir.kt b/compiler/testData/diagnostics/tests/inference/tooEagerSmartcast.fir.kt
index b1a627aa850..18be734f3fd 100644
--- a/compiler/testData/diagnostics/tests/inference/tooEagerSmartcast.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/tooEagerSmartcast.fir.kt
@@ -36,7 +36,7 @@ fun Number.num() {}
 fun main(b: Base<out Number>) {
     b.foo().num()
     if (b is Derived<*>) {
-        b.<!INAPPLICABLE_CANDIDATE!>foo<!>().num()
-        b.<!INAPPLICABLE_CANDIDATE!>baz<!>().<!UNRESOLVED_REFERENCE!>length<!>
+        b.<!INAPPLICABLE_CANDIDATE!>foo<!>().<!INAPPLICABLE_CANDIDATE!>num<!>()
+        b.<!INAPPLICABLE_CANDIDATE!>baz<!>().length
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/visibility.fir.kt b/compiler/testData/diagnostics/tests/inner/visibility.fir.kt
index 9f77c959bb3..73ed9de9800 100644
--- a/compiler/testData/diagnostics/tests/inner/visibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/inner/visibility.fir.kt
@@ -11,8 +11,8 @@ open class Outer {
 
 class Derived : Outer() {
     fun foo() {
-        Outer.<!INAPPLICABLE_CANDIDATE!>PrivateNested<!>()
-        super.<!INAPPLICABLE_CANDIDATE!>PrivateInner<!>()
+        Outer.<!HIDDEN!>PrivateNested<!>()
+        super.<!HIDDEN!>PrivateInner<!>()
 
         Outer.ProtectedNested()
         super.ProtectedInner()
@@ -23,11 +23,11 @@ class Derived : Outer() {
 }
 
 fun foo() {
-    Outer.<!INAPPLICABLE_CANDIDATE!>PrivateNested<!>()
-    Outer().<!INAPPLICABLE_CANDIDATE!>PrivateInner<!>()
+    Outer.<!HIDDEN!>PrivateNested<!>()
+    Outer().<!HIDDEN!>PrivateInner<!>()
 
-    Outer.<!INAPPLICABLE_CANDIDATE!>ProtectedNested<!>()
-    Outer().<!INAPPLICABLE_CANDIDATE!>ProtectedInner<!>()
+    Outer.<!HIDDEN!>ProtectedNested<!>()
+    Outer().<!HIDDEN!>ProtectedInner<!>()
 
     Outer.PublicNested()
     Outer().PublicInner()
diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.fir.kt b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.fir.kt
index 99645d5127a..4e236972154 100644
--- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.fir.kt
@@ -19,5 +19,5 @@ package c
 import b.F
 
 fun f() {
-    F().<!INAPPLICABLE_CANDIDATE!>m<!>
+    F().<!HIDDEN!>m<!>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.fir.kt b/compiler/testData/diagnostics/tests/j+k/packageVisibility.fir.kt
index ff2aed7313b..61da78ca763 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.fir.kt
@@ -26,19 +26,19 @@ package b
 
 import a.MyJavaClass
 
-val mc1 = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>()
+val mc1 = <!HIDDEN!>MyJavaClass<!>()
 
-val x = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>staticMethod<!>()
-val y = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>NestedClass<!>.<!UNRESOLVED_REFERENCE!>staticMethodOfNested<!>()
-val z = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>NestedClass<!>()
+val x = MyJavaClass.<!HIDDEN!>staticMethod<!>()
+val y = MyJavaClass.NestedClass.<!HIDDEN!>staticMethodOfNested<!>()
+val z = MyJavaClass.<!HIDDEN!>NestedClass<!>()
 
 //FILE: c.kt
 package a.c
 
 import a.MyJavaClass
 
-val mc1 = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>()
+val mc1 = <!HIDDEN!>MyJavaClass<!>()
 
-val x = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>staticMethod<!>()
-val y = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>NestedClass<!>.<!UNRESOLVED_REFERENCE!>staticMethodOfNested<!>()
-val z = <!INAPPLICABLE_CANDIDATE!>MyJavaClass<!>.<!UNRESOLVED_REFERENCE!>NestedClass<!>()
\ No newline at end of file
+val x = MyJavaClass.<!HIDDEN!>staticMethod<!>()
+val y = MyJavaClass.NestedClass.<!HIDDEN!>staticMethodOfNested<!>()
+val z = MyJavaClass.<!HIDDEN!>NestedClass<!>()
diff --git a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloads.fir.kt b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloads.fir.kt
index f02c153f3c8..80760d8daf3 100644
--- a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloads.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloads.fir.kt
@@ -19,9 +19,9 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
-    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<Double>>() }
-    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<String>>() }
+    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
+    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsDisabled.fir.kt b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsDisabled.fir.kt
index 3321253e4a3..aa113f16ee1 100644
--- a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsDisabled.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsDisabled.fir.kt
@@ -20,9 +20,9 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
-    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<Double>>() }
-    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<String>>() }
+    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
+    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsNI.fir.kt b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsNI.fir.kt
index 0bb6d5b9bbe..df77b661fc5 100644
--- a/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsNI.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/properties/fieldPropertyOverloadsNI.fir.kt
@@ -19,9 +19,9 @@ public abstract class CollectionWithSize implements java.util.Collection<String>
 // FILE: main.kt
 
 fun main(c: CollectionWithSize) {
-    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Double>() }
-    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    CompressionType.ZIP.<!AMBIGUITY!>name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Double>() }
+    c.<!AMBIGUITY!>size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 
-    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<Double>>() }
-    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><kotlin.reflect.KProperty0<String>>() }
+    <!UNRESOLVED_REFERENCE!>CompressionType.ZIP::name<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<Double>>() }
+    <!UNRESOLVED_REFERENCE!>c::size<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><kotlin.reflect.KProperty0<String>>() }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.fir.kt b/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.fir.kt
index f45fd6988e8..c339c400571 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.fir.kt
@@ -17,5 +17,5 @@ public class A {
 package bar
 
 fun main() {
-    foo.A.<!INAPPLICABLE_CANDIDATE!>f<!> {}
-}
\ No newline at end of file
+    foo.A.<!HIDDEN!>f<!> {}
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.fir.kt b/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.fir.kt
index c3363f2f69f..65798d88144 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.fir.kt
@@ -18,7 +18,7 @@ public class Inv<T> {
 
 fun test(inv: Inv<String>) {
     val m: ((String) -> String) -> Inv<String> = inv::map
-    <!INAPPLICABLE_CANDIDATE!>take<!>(inv::map)
+    <!INAPPLICABLE_CANDIDATE!>take<!>(<!UNRESOLVED_REFERENCE!>inv::map<!>)
 }
 
-fun take(f: ((String) -> String) -> Inv<String>) {}
\ No newline at end of file
+fun take(f: ((String) -> String) -> Inv<String>) {}
diff --git a/compiler/testData/diagnostics/tests/j+k/selectMoreSpecific.fir.kt b/compiler/testData/diagnostics/tests/j+k/selectMoreSpecific.fir.kt
index dec7050b358..c64eab51fd2 100644
--- a/compiler/testData/diagnostics/tests/j+k/selectMoreSpecific.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/selectMoreSpecific.fir.kt
@@ -11,6 +11,6 @@ public class A {
 // FILE: main.kt
 
 fun foo(a: A) {
-    a.<!AMBIGUITY!>foo<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-    A.<!AMBIGUITY!>bar<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+    a.<!AMBIGUITY!>foo<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+    A.<!AMBIGUITY!>bar<!>() <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.fir.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.fir.kt
deleted file mode 100644
index f9946ea73d7..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.fir.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL
-
-// MODULE: m1
-// FILE: a.kt
-package p
-
-public interface B {
-    public fun <T> foo(a: T): B?
-}
-
-// MODULE: m2(m1)
-// FILE: b.kt
-package p
-
-public interface C : B {
-    override fun <T> foo(a: T): B?
-
-}
-
-// MODULE: m3
-// FILE: b.kt
-package p
-
-public interface Tr
-
-public interface B {
-    public fun <T: Tr?> foo(a: T): B?
-}
-
-// MODULE: m4(m3, m2)
-// FILE: c.kt
-import p.*
-
-fun test(b: B?) {
-    if (b is C) {
-        // hard to find parameters for an ambiguous call, so we rely on NONE_APPLICABLE here
-        // as opposed to diagnostics for a single unmatched candidate
-        b?.<!INAPPLICABLE_CANDIDATE!>foo<!>()
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt
index cba582efada..269b4a88787 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNNECESSARY_SAFE_CALL
 
 // MODULE: m1
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.fir.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.fir.kt
index 3bd3957db38..8802f1cd5b7 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.fir.kt
@@ -16,5 +16,5 @@ import p.f
 
 fun test() {
     // There should be no "none applicable" error here
-    <!INAPPLICABLE_CANDIDATE!>f<!>(
+    <!NONE_APPLICABLE!>f<!>(
 <!SYNTAX!><!>}
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.fir.kt b/compiler/testData/diagnostics/tests/multimodule/internal.fir.kt
index d22b0c4034b..f69810ed517 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.fir.kt
@@ -22,14 +22,14 @@ internal class B
 import p.*
 
 fun test() {
-    val _a = <!INAPPLICABLE_CANDIDATE!>a<!>
-    val _v = <!INAPPLICABLE_CANDIDATE!>v<!>
-    <!INAPPLICABLE_CANDIDATE!>a<!>()
-    <!INAPPLICABLE_CANDIDATE!>B<!>()
+    val _a = <!HIDDEN!>a<!>
+    val _v = <!HIDDEN!>v<!>
+    <!HIDDEN!>a<!>()
+    <!HIDDEN!>B<!>()
 
     val inst = A()
-    val ia = inst.<!INAPPLICABLE_CANDIDATE!>a<!>
-    val iv = inst.<!INAPPLICABLE_CANDIDATE!>v<!>
-    inst.<!INAPPLICABLE_CANDIDATE!>a<!>()
-    inst.<!INAPPLICABLE_CANDIDATE!>B<!>()
-}
\ No newline at end of file
+    val ia = inst.<!HIDDEN!>a<!>
+    val iv = inst.<!HIDDEN!>v<!>
+    inst.<!HIDDEN!>a<!>()
+    inst.<!HIDDEN!>B<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.fir.kt b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.fir.kt
index 2cc1dbbbe05..dcc962ea7cc 100644
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.fir.kt
@@ -9,11 +9,11 @@ private val a = 1
 
 package p
 
-val b = <!INAPPLICABLE_CANDIDATE!>a<!> // same package, same module
+val b = <!HIDDEN!>a<!> // same package, same module
 
 // MODULE: m2(m1)
 // FILE: c.kt
 
 package p
 
-val c = <!INAPPLICABLE_CANDIDATE!>a<!> // same package, another module
+val c = <!HIDDEN!>a<!> // same package, another module
diff --git a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.fir.kt b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.fir.kt
index 6828470cc55..3ea44d37d47 100644
--- a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.fir.kt
@@ -30,27 +30,27 @@ internal class B
 import p.*
 
 fun test() {
-    val _a = <!INAPPLICABLE_CANDIDATE!>a<!>
-    val _v = <!INAPPLICABLE_CANDIDATE!>v<!>
-    <!INAPPLICABLE_CANDIDATE!>a<!>()
-    <!INAPPLICABLE_CANDIDATE!>B<!>()
+    val _a = <!HIDDEN!>a<!>
+    val _v = <!HIDDEN!>v<!>
+    <!HIDDEN!>a<!>()
+    <!HIDDEN!>B<!>()
 
     val inst = A()
-    val ia = inst.<!INAPPLICABLE_CANDIDATE!>a<!>
-    val iv = inst.<!INAPPLICABLE_CANDIDATE!>v<!>
-    inst.<!INAPPLICABLE_CANDIDATE!>a<!>()
-    inst.<!INAPPLICABLE_CANDIDATE!>B<!>()
+    val ia = inst.<!HIDDEN!>a<!>
+    val iv = inst.<!HIDDEN!>v<!>
+    inst.<!HIDDEN!>a<!>()
+    inst.<!HIDDEN!>B<!>()
 }
 
 inline fun testInline() {
-    val _a = <!INAPPLICABLE_CANDIDATE!>a<!>
-    val _v = <!INAPPLICABLE_CANDIDATE!>v<!>
-    <!INAPPLICABLE_CANDIDATE!>a<!>()
-    <!INAPPLICABLE_CANDIDATE!>B<!>()
+    val _a = <!HIDDEN!>a<!>
+    val _v = <!HIDDEN!>v<!>
+    <!HIDDEN!>a<!>()
+    <!HIDDEN!>B<!>()
 
     val inst = A()
-    val ia = inst.<!INAPPLICABLE_CANDIDATE!>a<!>
-    val iv = inst.<!INAPPLICABLE_CANDIDATE!>v<!>
-    inst.<!INAPPLICABLE_CANDIDATE!>a<!>()
-    inst.<!INAPPLICABLE_CANDIDATE!>B<!>()
-}
\ No newline at end of file
+    val ia = inst.<!HIDDEN!>a<!>
+    val iv = inst.<!HIDDEN!>v<!>
+    inst.<!HIDDEN!>a<!>()
+    inst.<!HIDDEN!>B<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.fir.kt
index 6f5ed38c95b..d06d0075a2d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/constructorInHeaderEnum.fir.kt
@@ -3,11 +3,11 @@
 // FILE: common.kt
 
 expect enum class En(x: Int) {
-    <!INAPPLICABLE_CANDIDATE!>E1,<!>
+    <!NONE_APPLICABLE!>E1,<!>
     E2(42),
     ;
 
-    <!INAPPLICABLE_CANDIDATE!>constructor(s: String)<!>
+    <!NONE_APPLICABLE!>constructor(s: String)<!>
 }
 
 expect enum class En2 {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.fir.kt
index 94dbc558730..1e5a623615a 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/explicitConstructorDelegation.fir.kt
@@ -8,7 +8,7 @@ expect open class A {
 }
 
 expect class B : A {
-    <!INAPPLICABLE_CANDIDATE!>constructor(i: Int)<!>
+    <!NONE_APPLICABLE!>constructor(i: Int)<!>
 
     constructor() : super("B")
 }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
index acd1bb85ef5..5d35855ba45 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
@@ -4,7 +4,7 @@
 // FILE: common.kt
 
 expect class Foo(zzz: Int) {
-    <!INAPPLICABLE_CANDIDATE!>constructor(aaa: Boolean)<!>
+    <!NONE_APPLICABLE!>constructor(aaa: Boolean)<!>
 
     fun f1(xxx: String): String
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.fir.kt
index 619597777fa..839925da1b5 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.fir.kt
@@ -9,9 +9,9 @@ operator infix fun A.div(i : Int) {}
 operator infix fun A?.times(i : Int) {}
 
 fun test(x : Int?, a : A?) {
-    x.<!INAPPLICABLE_CANDIDATE!>plus<!>(1)
+    x.<!NONE_APPLICABLE!>plus<!>(1)
     x?.plus(1)
-    x <!INAPPLICABLE_CANDIDATE!>+<!> 1
+    x <!NONE_APPLICABLE!>+<!> 1
     <!INAPPLICABLE_CANDIDATE!>-<!>x
     x.<!INAPPLICABLE_CANDIDATE!>unaryMinus<!>()
     x?.unaryMinus()
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.fir.kt
index 6b400c9e105..d5b70b57e5f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.fir.kt
@@ -2,7 +2,7 @@ fun test() {
   val out : Int? = null
   val x : Nothing? = null
   if (out != x)
-    out.<!INAPPLICABLE_CANDIDATE!>plus<!>(1)
+    out.<!NONE_APPLICABLE!>plus<!>(1)
   if (out == x) return
-  out.<!INAPPLICABLE_CANDIDATE!>plus<!>(1)
+  out.<!NONE_APPLICABLE!>plus<!>(1)
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
index 673aa7e412a..145f0c0349d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
@@ -16,7 +16,7 @@ fun foo() {
     val y: Int? = 0
     val z: Int? = 0
     <!INAPPLICABLE_CANDIDATE!>bar<!>(if (y != null) y else z, y)
-    y <!INAPPLICABLE_CANDIDATE!>+<!> 2
+    y <!NONE_APPLICABLE!>+<!> 2
     <!INAPPLICABLE_CANDIDATE!>baz<!>(y, y, if (y == null) return else y, y)
     baz(y, z!!, z, y)
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt
index 301ae2f36b3..460e89813aa 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.fir.kt
@@ -6,11 +6,11 @@ package example
 fun test() {
   val p = test.Public()
   if (p.public is Int) p.public + 1
-  if (p.<!INAPPLICABLE_CANDIDATE!>protected<!> is Int) p.<!INAPPLICABLE_CANDIDATE!>protected<!> + 1
+  if (p.<!HIDDEN!>protected<!> is Int) p.<!HIDDEN!>protected<!> <!NONE_APPLICABLE!>+<!> 1
   if (p.internal is Int) p.internal + 1
   val i = test.Internal()
   if (i.public is Int) i.public + 1
-  if (i.<!INAPPLICABLE_CANDIDATE!>protected<!> is Int) i.<!INAPPLICABLE_CANDIDATE!>protected<!> + 1
+  if (i.<!HIDDEN!>protected<!> is Int) i.<!HIDDEN!>protected<!> <!NONE_APPLICABLE!>+<!> 1
   if (i.internal is Int) i.internal + 1
 }
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.fir.kt
index 979f82d3b58..70a83ede2b7 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.fir.kt
@@ -13,17 +13,17 @@ class B {
 
     fun f() {
         a = A()
-        a.<!INAPPLICABLE_CANDIDATE!>f<!>(true)
-        takeInt(a.<!INAPPLICABLE_CANDIDATE!>f<!>(""))
-        a.<!INAPPLICABLE_CANDIDATE!>f<!>()
+        a.<!NONE_APPLICABLE!>f<!>(true)
+        takeInt(a.<!NONE_APPLICABLE!>f<!>(""))
+        a.<!NONE_APPLICABLE!>f<!>()
     }
 
     fun g() {
         takeInt(if (3 > 2) {
             a = A()
-            a.<!INAPPLICABLE_CANDIDATE!>f<!>(true)
+            a.<!NONE_APPLICABLE!>f<!>(true)
         } else {
             6
         })
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.fir.kt
index d82782e63de..dc944fc6d17 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.fir.kt
@@ -9,6 +9,6 @@ var a: A? = null
 
 fun smartCastInterference(b: B) {
     if (a != null) {
-        a.<!INAPPLICABLE_CANDIDATE!>foo<!>(b)
+        a.<!NONE_APPLICABLE!>foo<!>(b)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
index f4f557da92c..13ee4dbdf08 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
@@ -13,6 +13,6 @@ public class J {
 
 fun test(j: J, nullStr: String?, nullByte: Byte?, nullDouble: Double?) {
     j.foo(nullStr)
-    j.<!INAPPLICABLE_CANDIDATE!>foo<!>(nullDouble)
+    j.<!NONE_APPLICABLE!>foo<!>(nullDouble)
     j.foo(nullByte)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
index 02eb22e893e..9c07471393f 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
@@ -6,8 +6,8 @@ fun foo(x: Int) {}
 fun foo(x: Int, y: String) {}
 
 fun bar(nullX: Int?, nullY: String?, notNullY: String) {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(nullX)
+    <!NONE_APPLICABLE!>foo<!>(nullX)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(nullX, notNullY)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(nullX, nullY)
-    <!INAPPLICABLE_CANDIDATE!>foo<!>()
-}
\ No newline at end of file
+    <!NONE_APPLICABLE!>foo<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.fir.kt
index 990401d58be..7873fff6e33 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.fir.kt
@@ -25,14 +25,14 @@ operator fun ModMemberAndRemExtension.rem(x: Int) {}
 
 fun foo() {
     ModAndRem % 1
-    OldMod <!INAPPLICABLE_CANDIDATE!>%<!> 1
+    OldMod <!NONE_APPLICABLE!>%<!> 1
 
     ModAndRemExtension % 1
 
-    ModExtension <!INAPPLICABLE_CANDIDATE!>%<!> 1
+    ModExtension <!NONE_APPLICABLE!>%<!> 1
 
     ModMemberAndRemExtension % 1
 
     OldMod.mod(1)
     ModExtension.mod(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.fir.kt
index b3e37e080ec..21117f45dd6 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.fir.kt
@@ -25,14 +25,14 @@ operator fun ModMemberAndRemExtension.rem(x: Int) {}
 
 fun foo() {
     ModAndRem % 1
-    OldMod <!INAPPLICABLE_CANDIDATE!>%<!> 1
+    OldMod <!NONE_APPLICABLE!>%<!> 1
 
     ModAndRemExtension % 1
 
-    ModExtension <!INAPPLICABLE_CANDIDATE!>%<!> 1
+    ModExtension <!NONE_APPLICABLE!>%<!> 1
 
     ModMemberAndRemExtension % 1
 
     OldMod.mod(1)
     ModExtension.mod(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/InconsistentGetSet.fir.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/InconsistentGetSet.fir.kt
index 03d70dfc9c3..7050051b223 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/InconsistentGetSet.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/InconsistentGetSet.fir.kt
@@ -20,7 +20,7 @@ object MismatchingTypes {
 fun testMismatchingTypes() {
     <!INAPPLICABLE_CANDIDATE!>++MismatchingTypes[0]<!>
     <!INAPPLICABLE_CANDIDATE!>MismatchingTypes[0]++<!>
-    <!UNRESOLVED_REFERENCE!>MismatchingTypes[0] += 1<!>
+    MismatchingTypes[0] += 1
 }
 
 object MismatchingArities1 {
@@ -36,10 +36,10 @@ object MismatchingArities2 {
 fun testMismatchingArities() {
     <!INAPPLICABLE_CANDIDATE!>++MismatchingArities1[0]<!>
     <!INAPPLICABLE_CANDIDATE!>MismatchingArities1[0]++<!>
-    <!UNRESOLVED_REFERENCE!>MismatchingArities1[0] += 1<!>
+    MismatchingArities1[0] += 1
 
-    <!UNRESOLVED_REFERENCE!>++<!><!INAPPLICABLE_CANDIDATE!>MismatchingArities2[0]<!>
-    <!INAPPLICABLE_CANDIDATE!>MismatchingArities2[0]<!><!UNRESOLVED_REFERENCE!>++<!>
-    <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>MismatchingArities2[0]<!> += 1<!>
+    ++<!INAPPLICABLE_CANDIDATE!>MismatchingArities2[0]<!>
+    <!INAPPLICABLE_CANDIDATE!>MismatchingArities2[0]<!>++
+    MismatchingArities2[0] += 1
 }
 
diff --git a/compiler/testData/diagnostics/tests/overload/onlyPrivateOverloadsDiagnostic.fir.kt b/compiler/testData/diagnostics/tests/overload/onlyPrivateOverloadsDiagnostic.fir.kt
index 13028da997e..71cd8529a56 100644
--- a/compiler/testData/diagnostics/tests/overload/onlyPrivateOverloadsDiagnostic.fir.kt
+++ b/compiler/testData/diagnostics/tests/overload/onlyPrivateOverloadsDiagnostic.fir.kt
@@ -6,7 +6,7 @@ class A {
 }
 
 fun test(a: A) {
-    a.<!INAPPLICABLE_CANDIDATE!>foo<!>(3)
-    a.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    a.<!NONE_APPLICABLE!>foo<!>(3)
+    a.<!NONE_APPLICABLE!>foo<!>()
 }
 
diff --git a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.fir.kt b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.fir.kt
index 4a6d96de823..1d3a12557f7 100644
--- a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.fir.kt
@@ -10,5 +10,5 @@ open class C {
 }
 
 class Subject : C(), A {
-    val c = <!INAPPLICABLE_CANDIDATE!>a<!>
-}
\ No newline at end of file
+    val c = <!HIDDEN!>a<!>
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.fir.kt
index 27069db2ec1..de64ac8a435 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.fir.kt
@@ -13,5 +13,5 @@ public class B {
 
 // FILE: main.kt
 fun test() {
-    B.bar() { it.<!INAPPLICABLE_CANDIDATE!>hashCode<!>() <!UNRESOLVED_REFERENCE!>><!> 0 }
+    B.bar() { it.<!INAPPLICABLE_CANDIDATE!>hashCode<!>() > 0 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
index daa58e6d862..b6401dfa2a7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
@@ -30,26 +30,26 @@ fun test() {
     ++platformJ
 
     platformNN++
-    platformN<!INAPPLICABLE_CANDIDATE!>++<!>
+    platformN++
     platformJ++
 
     1 + platformNN
-    1 <!INAPPLICABLE_CANDIDATE!>+<!> platformN
+    1 + platformN
     1 + platformJ
 
     platformNN + 1
-    platformN <!INAPPLICABLE_CANDIDATE!>+<!> 1
+    platformN + 1
     platformJ + 1
 
     1 plus platformNN
-    1 <!INAPPLICABLE_CANDIDATE!>plus<!> platformN
+    1 plus platformN
     1 plus platformJ
 
     platformNN plus 1
-    platformN <!INAPPLICABLE_CANDIDATE!>plus<!> 1
+    platformN plus 1
     platformJ plus 1
 
     platformNN += 1
-    <!UNRESOLVED_REFERENCE!>platformN += 1<!>
+    platformN += 1
     platformJ += 1
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.fir.kt
index 85fe29d1472..39bda6289ca 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.fir.kt
@@ -22,7 +22,7 @@ fun test() {
     val platformJ = J.staticJ
 
     for (x in platformNN) {}
-    <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (x in platformN) {}<!>
+    <!INAPPLICABLE_CANDIDATE!>for (x in platformN) {}<!>
     for (x in platformJ) {}
 }
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.fir.kt
index 8c109ee9e4c..5f920cab0f7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.fir.kt
@@ -28,7 +28,7 @@ val strList: List<String> = null!!
 fun main() {
     val rawA = Test.rawAField
     var rawInner = rawA.<!INAPPLICABLE_CANDIDATE!>Inner<!><Double>("", "", strList)
-    rawInner.<!UNRESOLVED_REFERENCE!>foo<!>("", "", strList)
-    rawInner.<!UNRESOLVED_REFERENCE!>bar<!>().<!UNRESOLVED_REFERENCE!>foo<!>("")
+    rawInner.<!INAPPLICABLE_CANDIDATE!>foo<!>("", "", strList)
+    rawInner.bar().<!INAPPLICABLE_CANDIDATE!>foo<!>("")
 }
 
diff --git a/compiler/testData/diagnostics/tests/privateInFile/topLevelAnnotationCall.fir.kt b/compiler/testData/diagnostics/tests/privateInFile/topLevelAnnotationCall.fir.kt
index f3e97cd8266..9704b7c99f6 100644
--- a/compiler/testData/diagnostics/tests/privateInFile/topLevelAnnotationCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/privateInFile/topLevelAnnotationCall.fir.kt
@@ -17,11 +17,11 @@ class C1
 // FILE: 2.kt
 package pp
 
-@A(<!INAPPLICABLE_CANDIDATE!>foo<!>)
+@A(<!HIDDEN!>foo<!>)
 fun f2() {}
 
-@A(<!INAPPLICABLE_CANDIDATE!>foo<!>)
+@A(<!HIDDEN!>foo<!>)
 val p2 = ""
 
-@A(<!INAPPLICABLE_CANDIDATE!>foo<!>)
+@A(<!HIDDEN!>foo<!>)
 class C2
diff --git a/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt b/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt
index b864aefbc5d..abd889ae431 100644
--- a/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/privateInFile/visibility.fir.kt
@@ -30,20 +30,20 @@ package a
 fun test() {
     val y = makeA()
     y.bar()
-    <!INAPPLICABLE_CANDIDATE!>foo<!>()
+    <!HIDDEN!>foo<!>()
 
-    val u : A = <!INAPPLICABLE_CANDIDATE!>A<!>()
+    val u : A = <!HIDDEN!>A<!>()
 
-    val z = <!INAPPLICABLE_CANDIDATE!>x<!>
-    <!INAPPLICABLE_CANDIDATE!>x<!> = 30
+    val z = <!HIDDEN!>x<!>
+    <!HIDDEN!>x<!> = 30
 
-    val po = <!INAPPLICABLE_CANDIDATE!>PO<!>
+    val po = PO
 
     val v = xx
     xx = 40
 }
 
-class B : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>A<!>() {}
+class B : <!EXPOSED_SUPER_CLASS, HIDDEN!>A<!>() {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.fir.kt b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.fir.kt
index 7d8a798f289..6ec5de4f0a3 100644
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.fir.kt
@@ -11,8 +11,8 @@ fun takeFirst(expr: StringBuilder): Char {
 fun evaluateArg(expr: CharSequence, numbers: ArrayList<Int>): Int {
   if (expr.length == 0) throw Exception("Syntax error: Character expected");
   val c = <!INAPPLICABLE_CANDIDATE!>takeFirst<!>(expr)
-  if (c <!UNRESOLVED_REFERENCE!>>=<!> '0' && c <!UNRESOLVED_REFERENCE!><=<!> '9') {
-    val n = c <!UNRESOLVED_REFERENCE!>-<!> '0'
+  if (c >= '0' && c <= '9') {
+    val n = c - '0'
     if (!numbers.contains(n)) throw Exception("You used incorrect number: " + n)
     numbers.remove(n)
     return n
diff --git a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.fir.kt b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.fir.kt
index bca7a4babd4..895ef9ffa4b 100644
--- a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.fir.kt
@@ -5,5 +5,5 @@ fun <T : Bar, T1> foo(x : Int) {}
 fun <T1, T : Foo> foo(x : Long) {}
 
 fun f(): Unit {
-    <!INAPPLICABLE_CANDIDATE!>foo<!><Int, Int>(1)
+    <!NONE_APPLICABLE!>foo<!><Int, Int>(1)
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
index 43971cfe338..0b14f8f5049 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
@@ -13,7 +13,7 @@ operator fun Int.set(s: Int, x: String = "", z: Int) {
 fun main() {
     <!INAPPLICABLE_CANDIDATE!>1[2] = 1<!>
     1.set(2, z = 1)
-    <!UNRESOLVED_REFERENCE!>1[2] += 1<!>
+    1[2] += 1
 
     1.<!INAPPLICABLE_CANDIDATE!>set<!>(2, 1)
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt282.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt282.fir.kt
index 566da395178..f119809683d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt282.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt282.fir.kt
@@ -12,7 +12,7 @@ operator fun Int?.contains(x : Int) : Boolean = false
 fun f(): Unit {
     var set : Set? = null
     val i : Int? = null
-    i <!INAPPLICABLE_CANDIDATE!>+<!> 1
+    i <!NONE_APPLICABLE!>+<!> 1
     set + 1
     1 <!INAPPLICABLE_CANDIDATE!>in<!> set
     1 in 2
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.fir.kt
index b593f3be4c1..d11dc63cba4 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.fir.kt
@@ -5,6 +5,6 @@ class My {
 }
 
 fun My.foo(i: Int) {
-    <!INAPPLICABLE_CANDIDATE!>i<!>("")
-    <!INAPPLICABLE_CANDIDATE!>1("")<!>
+    <!HIDDEN!>i<!>("")
+    <!HIDDEN!>1("")<!>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
index b98a5e324ac..221636473b8 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
@@ -7,8 +7,8 @@ fun Int.invoke(a: Int, b: Int) {}
 class SomeClass
 
 fun test(identifier: SomeClass, fn: String.() -> Unit) {
-    <!INAPPLICABLE_CANDIDATE!>identifier<!>()
+    <!NONE_APPLICABLE!>identifier<!>()
     <!INAPPLICABLE_CANDIDATE!>identifier<!>(123)
     <!INAPPLICABLE_CANDIDATE!>identifier<!>(1, 2)
     1.<!INAPPLICABLE_CANDIDATE!>fn<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
index cafa9a5dd7f..91c6e8b763d 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
@@ -80,7 +80,7 @@ operator fun <T> Foo6<T>.invoke(x: Int) {}
 
 fun main(x: Bar6<String>?) {
     x?.value(1)
-    x?.value.<!INAPPLICABLE_CANDIDATE!>invoke<!>(1)
+    x?.value.<!NONE_APPLICABLE!>invoke<!>(1)
 }
 
 // Test case 7: top-level generic invoke and invoke with compatible additional dispatch recevier
@@ -108,7 +108,7 @@ operator fun Foo8<String>.invoke(x: Int) {}
 
 fun main(x: Bar8<String>?) {
     x?.value(1)
-    x?.value.<!INAPPLICABLE_CANDIDATE!>invoke<!>(1)
+    x?.value.<!NONE_APPLICABLE!>invoke<!>(1)
 }
 
 // Test case 9: additional receiver, generic invoke with pure type perameter receiver
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
index 3a4dbb8fdbb..a7c8c04aa1e 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
@@ -17,7 +17,7 @@ fun test(a: A, b: B) {
 
         b.(foo)()
 
-        <!UNRESOLVED_REFERENCE!>(b.<!INAPPLICABLE_CANDIDATE!>foo<!>)()<!>
+        <!INAPPLICABLE_CANDIDATE!>(b.<!INAPPLICABLE_CANDIDATE!>foo<!>)()<!>
 
         foo(b)
         (foo)(b)
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
index 08eb5f4d3ac..f416eb22b4d 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
@@ -5,7 +5,7 @@ fun foo(i: Int) = i
 fun foo(s: String) = s
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>foo<!>(emptyList())
+    <!NONE_APPLICABLE!>foo<!>(emptyList())
 }
 
-fun <T> emptyList(): List<T> {throw Exception()}
\ No newline at end of file
+fun <T> emptyList(): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.fir.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.fir.kt
index f0b8c73eac2..5da913f1e1b 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.fir.kt
@@ -19,20 +19,20 @@ class E {
         // `bar` calls are inapplicable since both E nor D aren't proper receivers
         // But prior to this change, every lambda was analyzed repeatedly for every candidate
         // Thus, the resulting time was exponential
-        <!INAPPLICABLE_CANDIDATE!>bar<!> {
-            <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                    <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                        <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                            <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                    <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                        <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                            <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                                <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                                    <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                                        <!INAPPLICABLE_CANDIDATE!>bar<!> {
-                                                            <!INAPPLICABLE_CANDIDATE!>bar<!> {
+        <!NONE_APPLICABLE!>bar<!> {
+            <!NONE_APPLICABLE!>bar<!> {
+                <!NONE_APPLICABLE!>bar<!> {
+                    <!NONE_APPLICABLE!>bar<!> {
+                        <!NONE_APPLICABLE!>bar<!> {
+                            <!NONE_APPLICABLE!>bar<!> {
+                                <!NONE_APPLICABLE!>bar<!> {
+                                    <!NONE_APPLICABLE!>bar<!> {
+                                        <!NONE_APPLICABLE!>bar<!> {
+                                            <!NONE_APPLICABLE!>bar<!> {
+                                                <!NONE_APPLICABLE!>bar<!> {
+                                                    <!NONE_APPLICABLE!>bar<!> {
+                                                        <!NONE_APPLICABLE!>bar<!> {
+                                                            <!NONE_APPLICABLE!>bar<!> {
 
                                                             }
                                                         }
diff --git a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.fir.kt b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.fir.kt
index 373bd9da30e..e8523a23f44 100644
--- a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.fir.kt
@@ -9,11 +9,11 @@ fun test() {
     val interface_as_fun = <!UNRESOLVED_REFERENCE!>A<!>()
     val interface_as_val = A
 
-    val object_as_fun = <!INAPPLICABLE_CANDIDATE!>B<!>()
+    val object_as_fun = <!HIDDEN!>B<!>()
     val class_as_val = C
 }
 
 fun <T> bar() {
     val typeParameter_as_val = <!OTHER_ERROR, OTHER_ERROR!>T<!>
     val typeParameter_as_fun = <!UNRESOLVED_REFERENCE!>T<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
index 692b447b83a..e9d9b4acc49 100644
--- a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
@@ -11,7 +11,7 @@ fun testX() {
     val interface_as_fun = X.<!UNRESOLVED_REFERENCE!>A<!>()
     val interface_as_val = X.A
 
-    val object_as_fun = X.<!INAPPLICABLE_CANDIDATE!>B<!>()
+    val object_as_fun = X.<!HIDDEN!>B<!>()
     val class_as_val = X.C
 }
 
@@ -26,7 +26,7 @@ fun testY() {
     val interface_as_fun = Y.<!UNRESOLVED_REFERENCE!>A<!>()
     val interface_as_val = Y.A
 
-    val object_as_fun = Y.<!INAPPLICABLE_CANDIDATE!>B<!>()
+    val object_as_fun = Y.<!HIDDEN!>B<!>()
     val class_as_val = Y.C
 }
 
@@ -36,4 +36,4 @@ fun test(x: X) {
 
     val object_as_fun = x.<!UNRESOLVED_REFERENCE!>B<!>()
     val class_as_val = x.C
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.fir.kt
index a78ef79e23e..7a0759a1f57 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.fir.kt
@@ -8,6 +8,6 @@ fun overloadedFun(arg: String, vararg args: String) = X1
 fun overloadedFun(arg: String, vararg args: String, flag: Boolean = true) = X2
 
 val test1a: X1 = overloadedFun("", "")
-val test1b: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun<!>("", args = "")
+val test1b: X1 = <!NONE_APPLICABLE!>overloadedFun<!>("", args = "")
 val test1c: X2 = overloadedFun("", "", "", flag = true)
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.fir.kt
index d6cb070fa8a..f0b1ad0d89a 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.fir.kt
@@ -9,5 +9,5 @@ fun overloadedFun5(s: String, vararg ss: String) = X2
 
 val test1 = overloadedFun5("")
 val test2 = overloadedFun5("", "")
-val test3: X2 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(s = "", ss = "")
-val test4: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(ss = "")
\ No newline at end of file
+val test3: X2 = <!NONE_APPLICABLE!>overloadedFun5<!>(s = "", ss = "")
+val test4: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(ss = "")
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
index ed8ac74968a..730066d811c 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
@@ -23,15 +23,15 @@ fun testDataFlowInfo1(a: Int?, b: Int?) {
     val c: Int = a ?: b!!
     doInt(c)
     // b is nullable if a != null
-    b <!INAPPLICABLE_CANDIDATE!>+<!> 1
+    b <!NONE_APPLICABLE!>+<!> 1
 }
 
 fun testDataFlowInfo2(a: Int?, b: Int?) {
     doInt(a ?: b!!)
     // b is nullable if a != null
-    b <!INAPPLICABLE_CANDIDATE!>+<!> 1
+    b <!NONE_APPLICABLE!>+<!> 1
 }
 
 fun testTypeMismatch(a: String?, b: Any) {
     <!INAPPLICABLE_CANDIDATE!>doInt<!>(a ?: b)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
index 08666e38507..8e4fd966f51 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.fir.kt
@@ -22,10 +22,10 @@ public interface J {
 
 // FILE: 1.kt
 fun test(j: J) {
-    j.<!AMBIGUITY!>foo<!>({ <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" }, "") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    j.<!AMBIGUITY!>foo<!>({ <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" }, "") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
 
-    j.<!AMBIGUITY!>bas<!>({ <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" }, "") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    j.<!AMBIGUITY!>bas<!>({ <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" }, "") <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
 
     // NI: TODO
     j.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { _<Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
index 9e798e39854..b2d9a1b570a 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.fir.kt
@@ -21,10 +21,10 @@ interface K {
 }
 
 fun test(k: K) {
-    k.<!AMBIGUITY!>foo<!> { <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" } <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    k.<!AMBIGUITY!>foo<!> { <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
 
-    k.<!AMBIGUITY!>bas<!> { <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any?>() }; "" } <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+    k.<!AMBIGUITY!>bas<!> { <!UNRESOLVED_REFERENCE!>it<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { _<Any?>() }; "" } <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
 
     // NI: TODO
     k.bar { it checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any>() }; "" } checkType { _<Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgument.fir.kt b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgument.fir.kt
index ac380628de6..7b117600a13 100644
--- a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgument.fir.kt
@@ -35,12 +35,12 @@ fun main(x2: Runnable) {
     Test.<!INAPPLICABLE_CANDIDATE!>foo1<!>(x2, arrayOf(""))
     Test.foo1(x2, *arrayOf(""))
 
-    val i1 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf())
+    val i1 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf())
     val i2 = Test({}, *arrayOf())
-    val i3 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, x3)
-    val i4 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf(""))
+    val i3 = <!NONE_APPLICABLE!>Test<!>({}, x3)
+    val i4 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf(""))
     val i5 = Test({}, {}, *arrayOf(""))
-    val i6 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, {}, arrayOf())
+    val i6 = <!NONE_APPLICABLE!>Test<!>({}, {}, arrayOf())
 
     i1.<!UNRESOLVED_REFERENCE!>foo2<!>({}, {}, arrayOf())
     i1.<!UNRESOLVED_REFERENCE!>foo2<!>({}, {}, *arrayOf())
diff --git a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.fir.kt b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.fir.kt
index 3f1734f84b8..c793fba46ee 100644
--- a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.fir.kt
@@ -35,12 +35,12 @@ fun main(x2: Runnable) {
     Test.<!INAPPLICABLE_CANDIDATE!>foo1<!>(x2, arrayOf(""))
     Test.foo1(x2, *arrayOf(""))
 
-    val i1 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf())
+    val i1 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf())
     val i2 = Test({}, *arrayOf())
-    val i3 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, x3)
-    val i4 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf(""))
+    val i3 = <!NONE_APPLICABLE!>Test<!>({}, x3)
+    val i4 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf(""))
     val i5 = Test({}, {}, *arrayOf(""))
-    val i6 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, {}, arrayOf())
+    val i6 = <!NONE_APPLICABLE!>Test<!>({}, {}, arrayOf())
 
     i2.<!INAPPLICABLE_CANDIDATE!>foo2<!>({}, {}, arrayOf())
     i2.foo2({}, {}, *arrayOf())
diff --git a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.fir.kt b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.fir.kt
index 8cb08a16972..bd59ac25695 100644
--- a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.fir.kt
@@ -35,12 +35,12 @@ fun main(x2: Runnable) {
     Test.<!INAPPLICABLE_CANDIDATE!>foo1<!>(x2, arrayOf(""))
     Test.foo1(x2, *arrayOf(""))
 
-    val i1 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf())
+    val i1 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf())
     val i2 = Test({}, *arrayOf())
-    val i3 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, x3)
-    val i4 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, arrayOf(""))
+    val i3 = <!NONE_APPLICABLE!>Test<!>({}, x3)
+    val i4 = <!NONE_APPLICABLE!>Test<!>({}, arrayOf(""))
     val i5 = Test({}, {}, *arrayOf(""))
-    val i6 = <!INAPPLICABLE_CANDIDATE!>Test<!>({}, {}, arrayOf())
+    val i6 = <!NONE_APPLICABLE!>Test<!>({}, {}, arrayOf())
 
     i1.<!UNRESOLVED_REFERENCE!>foo2<!>({}, {}, arrayOf())
     i1.<!UNRESOLVED_REFERENCE!>foo2<!>({}, {}, *arrayOf())
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt
index 9ec96d5cc79..7251d6ec170 100644
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt
@@ -19,15 +19,15 @@ open class A {
 fun fromOutside() {
     devNull(A.internal_val)
     devNull(A.public_val)
-    devNull(A.<!INAPPLICABLE_CANDIDATE!>private_val<!>)
-    devNull(A.<!INAPPLICABLE_CANDIDATE!>protected_val<!>)
+    devNull(A.<!HIDDEN!>private_val<!>)
+    devNull(A.<!HIDDEN!>protected_val<!>)
 }
 
 class B: A() {
     fun fromSubclass() {
         devNull(A.internal_val)
         devNull(A.public_val)
-        devNull(A.<!INAPPLICABLE_CANDIDATE!>private_val<!>)
+        devNull(A.<!HIDDEN!>private_val<!>)
         devNull(A.protected_val)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt
index 0b98742efd6..5c153794af9 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt
@@ -23,8 +23,8 @@ class B extends A {
 // FILE: test.kt
 
 fun test() {
-    A.<!INAPPLICABLE_CANDIDATE!>a<!>
-    A.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    A.<!HIDDEN!>a<!>
+    A.<!HIDDEN!>foo<!>()
     A.b
     A.bar()
     B.a
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt
index 60cec2541c2..894f7089d50 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt
@@ -8,6 +8,6 @@ class A {
 
 class B() {
     init {
-        A().<!INAPPLICABLE_CANDIDATE!>a<!> = "Hello"
+        A().<!HIDDEN!>a<!> = "Hello"
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt
index 1a47ec37bf5..532007dca8f 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt
@@ -6,6 +6,6 @@ class A(private var i: Int, var j: Int) {
 }
 
 fun test(a: A) {
-    a.<!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>i<!><!UNRESOLVED_REFERENCE!>++<!>
+    a.<!HIDDEN, HIDDEN!>i<!>++
     a.j++
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1805.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1805.fir.kt
index 62dd30d6aa1..eeeff3afa70 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1805.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1805.fir.kt
@@ -7,14 +7,14 @@ open class Some {
 
 class SomeSubclass : Some() {
     fun test() {
-        this.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 1. Unresolved reference
+        this.<!HIDDEN!>privateField<!> // 1. Unresolved reference
     }
 }
 
 fun test() {
     val s2 = Some()
-    s2.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 2. Can't access to 'privateField' in Some
+    s2.<!HIDDEN!>privateField<!> // 2. Can't access to 'privateField' in Some
 
     val s1 = SomeSubclass()
-    s1.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 3. Unresolved reference
-}
\ No newline at end of file
+    s1.<!HIDDEN!>privateField<!> // 3. Unresolved reference
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1806.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1806.fir.kt
index 657f069c623..7255217b584 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1806.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1806.fir.kt
@@ -8,7 +8,7 @@ object MyObject {
 
 fun test1() {
 
-    doSmth(MyObject.<!INAPPLICABLE_CANDIDATE!>message<!>)
+    doSmth(MyObject.<!HIDDEN!>message<!>)
 }
 
 class Test {
@@ -17,8 +17,8 @@ class Test {
   }
 
   fun test2() {
-      doSmth(MyObject1.<!INAPPLICABLE_CANDIDATE!>message<!>)
+      doSmth(MyObject1.<!HIDDEN!>message<!>)
   }
 }
 
-fun doSmth(s: String) = s
\ No newline at end of file
+fun doSmth(s: String) = s
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt1942.fir.kt
index c5bca2a4f52..e10c04b6470 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1942.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1942.fir.kt
@@ -14,6 +14,6 @@ import a.C
 
 class A : C() {
     fun test() {
-        val v = <!INAPPLICABLE_CANDIDATE!>myValue<!>
+        val v = <!HIDDEN!>myValue<!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt37.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt37.fir.kt
index f97b49359ba..1d8fe8aa0f9 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt37.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt37.fir.kt
@@ -11,6 +11,6 @@ class C() {
 
 fun box(): String {
     val c = C()
-    if (c.<!INAPPLICABLE_CANDIDATE!>f<!> != 610) return "fail"
+    if (c.<!HIDDEN!>f<!> != 610) return "fail"
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt9430.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt9430.fir.kt
index 6ae08ad0b74..fae56d55844 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt9430.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt9430.fir.kt
@@ -12,5 +12,5 @@ class C: A() {
 }
 
 class D {
-    fun qux() { B().<!INAPPLICABLE_CANDIDATE!>foo<!>() }
-}
\ No newline at end of file
+    fun qux() { B().<!HIDDEN!>foo<!>() }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerProtectedClass.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerProtectedClass.fir.kt
index e0e8817a654..c4704df078f 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerProtectedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerProtectedClass.fir.kt
@@ -8,6 +8,6 @@ class Foo : BaseClass() {
     fun bar() {
         val f = foo()
         f.x
-        f.<!INAPPLICABLE_CANDIDATE!>y<!>
+        f.<!HIDDEN!>y<!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.fir.kt
index 2e91e55aa73..05790b6520b 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.fir.kt
@@ -39,20 +39,20 @@ class KotlinClass2 : JavaClass() {
 }
 
 fun test(a: KotlinClass, b: KotlinClass2) {
-    a.<!INAPPLICABLE_CANDIDATE!>foo<!>() // Error, protected_and_package declared in different package
+    a.<!HIDDEN!>foo<!>() // Error, protected_and_package declared in different package
     b.foo() // Error, protected visibility in same package (but could be protected_and_package)
 
-    a.<!INAPPLICABLE_CANDIDATE!>field<!>
+    a.<!HIDDEN!>field<!>
 
-    JavaClass.<!INAPPLICABLE_CANDIDATE!>bar1<!>()
-    JavaClass.<!INAPPLICABLE_CANDIDATE!>CONST1<!>
+    JavaClass.<!HIDDEN!>bar1<!>()
+    JavaClass.<!HIDDEN!>CONST1<!>
 
     KotlinClass.<!UNRESOLVED_REFERENCE!>bar1<!>() // Currently it's unresolved, but it should be prohibited even in case it would be resolved
     KotlinClass.<!UNRESOLVED_REFERENCE!>CONST1<!>
 
-    JavaClassSamePackage.<!INAPPLICABLE_CANDIDATE!>bar1<!>()
+    JavaClassSamePackage.<!HIDDEN!>bar1<!>()
     JavaClassSamePackage.bar2()
 
-    JavaClassSamePackage.<!INAPPLICABLE_CANDIDATE!>CONST1<!>
+    JavaClassSamePackage.<!HIDDEN!>CONST1<!>
     JavaClassSamePackage.CONST2
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/protectedCallOnSubClass.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/protectedCallOnSubClass.fir.kt
index 2a48ebec1a3..c35ea5d7376 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/protectedCallOnSubClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/protectedCallOnSubClass.fir.kt
@@ -4,7 +4,7 @@ open class A {
 
     fun bar(x: B) {
         x.foo() // OK, foo declared in A
-        x.<!INAPPLICABLE_CANDIDATE!>baz<!>() // Declared in B
+        x.<!HIDDEN!>baz<!>() // Declared in B
         x.foobaz() // Declared in B
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.fir.kt
index 52bdddb16ae..f3a96b5818a 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.fir.kt
@@ -40,6 +40,6 @@ class B : A() {
 }
 
 fun baz(a: A) {
-    a.<!INAPPLICABLE_CANDIDATE!>foo<!>
+    a.<!HIDDEN!>foo<!>
     a.bar = a.bar + ""
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
index a36bbbcebd6..71d79553922 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
@@ -27,5 +27,5 @@ class B : A() {
 }
 
 fun baz(a: A) {
-    a.<!INAPPLICABLE_CANDIDATE!>foo<!> { }
+    a.<!HIDDEN!>foo<!> { }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt b/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt
index a6c408dbc7f..4f5423b32c8 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility.fir.kt
@@ -40,8 +40,8 @@ class B {
 }
 
 fun test3(a: A) {
-    a.<!INAPPLICABLE_CANDIDATE!>v<!> //todo .bMethod()
-    a.<!INAPPLICABLE_CANDIDATE!>f<!>(0, 1) //todo .bMethod()
+    a.<!HIDDEN!>v<!> //todo .bMethod()
+    a.<!HIDDEN!>f<!>(0, 1) //todo .bMethod()
 }
 
 interface T
@@ -54,7 +54,7 @@ open class C : T {
 }
 
 fun test4(c: C) {
-    c.<!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>i<!><!UNRESOLVED_REFERENCE!>++<!>
+    c.<!HIDDEN, HIDDEN!>i<!>++
 }
 
 class D : C() {
@@ -78,7 +78,7 @@ class F : C() {
 
 class G : T {
     fun test8(c: C) {
-        doSmth(c.<!INAPPLICABLE_CANDIDATE!>i<!>)
+        doSmth(c.<!HIDDEN!>i<!>)
     }
 }
 
@@ -91,5 +91,5 @@ import test_visibility.*
 
 fun test() {
     internal_fun()
-    <!INAPPLICABLE_CANDIDATE!>private_fun<!>()
+    <!HIDDEN!>private_fun<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt b/compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt
index d9d674129ca..f777acc7ef4 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt
@@ -25,15 +25,15 @@ import a.PO
 fun test() {
     val y = makeA()
     y.bar()
-    <!INAPPLICABLE_CANDIDATE!>foo<!>()
+    <!HIDDEN!>foo<!>()
 
-    val u : A = <!INAPPLICABLE_CANDIDATE!>A<!>()
+    val u : A = <!HIDDEN!>A<!>()
     val a : java.util.Arrays.ArrayList<Int>;
 
-    val po = <!INAPPLICABLE_CANDIDATE!>PO<!>
+    val po = PO
 }
 
-class B : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>A<!>() {}
+class B : <!EXPOSED_SUPER_CLASS, HIDDEN!>A<!>() {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt b/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt
index d9ef372f7fa..3da4f8c66c5 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt
@@ -26,17 +26,17 @@ package a
 fun test() {
     val y = makeA()
     y.bar()
-    <!INAPPLICABLE_CANDIDATE!>foo<!>()
+    <!HIDDEN!>foo<!>()
 
-    val u : A = <!INAPPLICABLE_CANDIDATE!>A<!>()
+    val u : A = <!HIDDEN!>A<!>()
 
-    val z = <!INAPPLICABLE_CANDIDATE!>x<!>
-    <!INAPPLICABLE_CANDIDATE!>x<!> = 30
+    val z = <!HIDDEN!>x<!>
+    <!HIDDEN!>x<!> = 30
 
-    val po = <!INAPPLICABLE_CANDIDATE!>PO<!>
+    val po = PO
 }
 
-class B : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>A<!>() {}
+class B : <!EXPOSED_SUPER_CLASS, HIDDEN!>A<!>() {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.fir.kt
index 2ea87126057..10ec62d7609 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.fir.kt
@@ -17,7 +17,7 @@ class A : B {
         <!INAPPLICABLE_CANDIDATE!>foo<!>(x, y, myProp)
         x + y + myProp + parentProp + super.parentProp
     }
-    constructor(x: B, y: Int = <!UNRESOLVED_REFERENCE!>global2<!>): <!INAPPLICABLE_CANDIDATE!>this<!>("", x) {
+    constructor(x: B, y: Int = <!UNRESOLVED_REFERENCE!>global2<!>): <!NONE_APPLICABLE!>this<!>("", x) {
         x.parentProp + y + myProp + parentProp + super.parentProp
     }
 
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.fir.kt
deleted file mode 100644
index 4c912288c9f..00000000000
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.fir.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-class A {
-    companion object {
-        fun foo(): Int = 1
-        val prop = 2
-        val C = 3
-    }
-    object B {
-        fun bar(): Int = 4
-        val prop = 5
-    }
-    object C {
-    }
-
-    constructor(x: Int)
-    constructor() : this(foo() + prop + B.bar() + B.prop <!INAPPLICABLE_CANDIDATE!>+<!> C)
-}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt
index 43955eaad66..ae392efed0f 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A {
     companion object {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
index 84046fb59e6..758a84a4c91 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
@@ -19,7 +19,7 @@ val y2: B<Int> = B("")
 val y3: B<Int> = B<Int>(1)
 val y4: B<Int> = B<Int>("")
 
-val y5: B<String> = <!INAPPLICABLE_CANDIDATE!>B<!><String>(1)
+val y5: B<String> = <!NONE_APPLICABLE!>B<!><String>(1)
 val y6: B<String> = B<String>("")
 val y7: B<String> = B(1)
 val y8: B<String> = B("")
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
index 9c729568897..db0e6e81180 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.fir.kt
@@ -5,7 +5,7 @@ object A {
 
 enum class B {
     X() {
-        <!CONSTRUCTOR_IN_OBJECT, INAPPLICABLE_CANDIDATE!>constructor()<!>
+        <!CONSTRUCTOR_IN_OBJECT, NONE_APPLICABLE!>constructor()<!>
     }
 }
 
@@ -17,4 +17,4 @@ class C {
 
 val anonObject = object {
     <!CONSTRUCTOR_IN_OBJECT!>constructor()<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
index adb9db90e3e..519cceb2ace 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
@@ -26,8 +26,8 @@ open class B2 {
 }
 
 class A2 : B2 {
-    <!INAPPLICABLE_CANDIDATE!>constructor()<!>
-    constructor(x: Int) : <!INAPPLICABLE_CANDIDATE!>super<!>()
+    <!NONE_APPLICABLE!>constructor()<!>
+    constructor(x: Int) : <!NONE_APPLICABLE!>super<!>()
 }
 
 // --------------------------
@@ -37,6 +37,6 @@ open class B3 {
 }
 
 class A3 : B3 {
-    <!INAPPLICABLE_CANDIDATE!>constructor()<!>
-    constructor(x: Int) : <!INAPPLICABLE_CANDIDATE!>super<!>()
-}
\ No newline at end of file
+    <!HIDDEN!>constructor()<!>
+    constructor(x: Int) : <!HIDDEN!>super<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.fir.kt
index 8a039f7c217..df8a596f983 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.fir.kt
@@ -5,6 +5,6 @@ open class B(x: Double) {
 }
 interface C
 class A : B, C {
-    constructor(): <!INAPPLICABLE_CANDIDATE!>super<!>(' ')
-    <!INAPPLICABLE_CANDIDATE!>constructor(x: Int)<!>
+    constructor(): <!NONE_APPLICABLE!>super<!>(' ')
+    <!NONE_APPLICABLE!>constructor(x: Int)<!>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.fir.kt
deleted file mode 100644
index 38fda4d75df..00000000000
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
-
-class A {
-    constructor(x: Int) {}
-    constructor(x: String) {}
-    constructor(): <!INAPPLICABLE_CANDIDATE!>this<!>('a') {}
-}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
index 12230ab2219..23dee119533 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !WITH_NEW_INFERENCE
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
index 31282d67b4f..ae481e57005 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
@@ -33,6 +33,6 @@ fun test() {
         x.baz(1).checkType { _<Unit>() }
         x.<!INAPPLICABLE_CANDIDATE!>baz<!>(1, 2)
 
-        x.<!UNRESOLVED_REFERENCE!>foobar<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        x.<!UNRESOLVED_REFERENCE!>foobar<!>().<!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
index a6e7d8391bc..8ce2be9293b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
@@ -16,7 +16,7 @@ fun foo(): Int {
         k.run()
         val d: Int = c
         // a is not null because of k constructor, but we do not know it
-        return a <!INAPPLICABLE_CANDIDATE!>+<!> d
+        return a <!NONE_APPLICABLE!>+<!> d
     }
     else return -1
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.fir.kt
index 98186b9a1c3..ffe2b8b8155 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.fir.kt
@@ -11,7 +11,7 @@ fun foo(): Int {
         }
         k.run()
         val d: Int = c
-        return a <!INAPPLICABLE_CANDIDATE!>+<!> d
+        return a <!NONE_APPLICABLE!>+<!> d
     }
     else return -1
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.fir.kt
index 0ed5e29c566..41d7c35a27d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.fir.kt
@@ -15,7 +15,7 @@ fun foo(): Int {
         }
         k.run()
         val d: Int = c
-        return a <!INAPPLICABLE_CANDIDATE!>+<!> d
+        return a <!NONE_APPLICABLE!>+<!> d
     }
     else return -1
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.fir.kt
index fc765b7bd64..f5f30b02038 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.fir.kt
@@ -6,8 +6,8 @@ fun test(foo: Foo?) {
         // Error, foo?.bar is nullable
         it.<!INAPPLICABLE_CANDIDATE!>length<!>
         // Error, foo is nullable
-        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.<!UNRESOLVED_REFERENCE!>length<!>
+        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.length
         // Correct
         foo?.bar?.length
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiverInLongChain.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiverInLongChain.fir.kt
index eaa94bcd0f5..ecc2789719d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiverInLongChain.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiverInLongChain.fir.kt
@@ -13,13 +13,13 @@ fun test(foo: Foo?) {
         // Error, foo?.bar?.gav is nullable
         it.<!INAPPLICABLE_CANDIDATE!>length<!>
         // Error, foo is nullable
-        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.<!UNRESOLVED_REFERENCE!>gav<!>.<!UNRESOLVED_REFERENCE!>length<!>
+        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.gav.length
         // Correct
         foo?.bar?.gav?.length
     }
     foo?.bar?.gav.call { it }?.notNullLet {
         foo.<!INAPPLICABLE_CANDIDATE!>hashCode<!>()
-        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.<!UNRESOLVED_REFERENCE!>hashCode<!>()
+        foo.<!INAPPLICABLE_CANDIDATE!>bar<!>.hashCode()
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.fir.kt
index 0f2d88161aa..464e07a5964 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.fir.kt
@@ -5,7 +5,7 @@ class A(val x: String?) {
     fun foo(other: A) {
         when {
             x == null && other.x == null -> "1"
-            x.<!INAPPLICABLE_CANDIDATE!>length<!> <!UNRESOLVED_REFERENCE!>><!> 0 -> "2"
+            x.<!INAPPLICABLE_CANDIDATE!>length<!> > 0 -> "2"
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
index 3715e9d1bfd..1cfb9d42787 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
@@ -12,10 +12,10 @@ operator fun Long?.inc() = this?.let { it + 1 }
 fun bar(arg: Long?): Long {
     var i = arg
     if (i++ == 5L) {
-        return i<!INAPPLICABLE_CANDIDATE!>--<!> <!INAPPLICABLE_CANDIDATE!>+<!> i
+        return i<!INAPPLICABLE_CANDIDATE!>--<!> + i
     }
     if (i++ == 7L) {
-        return i++ <!INAPPLICABLE_CANDIDATE!>+<!> i
+        return i++ <!NONE_APPLICABLE!>+<!> i
     }
     return 0L
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
index 72785f3b31e..cf186a5270e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
@@ -14,8 +14,8 @@ class MyClass {
         var res = 0
         m = create()
         // See KT-7428
-        <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for ((k, v) in m)
-            <!UNRESOLVED_REFERENCE!>res += (k.<!UNRESOLVED_REFERENCE!>length<!> + v.<!UNRESOLVED_REFERENCE!>length<!>)<!><!>
+        <!INAPPLICABLE_CANDIDATE!>for ((k, v) in m)
+            res += (k.length + v.length)<!>
         return res
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
index 918c32fc744..084c76726f7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
@@ -2,5 +2,5 @@
 fun foo(): Int {
     var i: Int? = 42
     i = null
-    return i <!INAPPLICABLE_CANDIDATE!>+<!> 1
-}
\ No newline at end of file
+    return i <!NONE_APPLICABLE!>+<!> 1
+}
diff --git a/compiler/testData/diagnostics/tests/suspendConversion/basicSuspendConversionForCallableReference.fir.kt b/compiler/testData/diagnostics/tests/suspendConversion/basicSuspendConversionForCallableReference.fir.kt
index c04a53729ca..0dbf408b74a 100644
--- a/compiler/testData/diagnostics/tests/suspendConversion/basicSuspendConversionForCallableReference.fir.kt
+++ b/compiler/testData/diagnostics/tests/suspendConversion/basicSuspendConversionForCallableReference.fir.kt
@@ -14,5 +14,5 @@ fun test() {
     foo2(42, ::bar2)
     foo2("str", ::bar2)
 
-    <!INAPPLICABLE_CANDIDATE!>foo2<!>(42, ::bar1)
+    <!INAPPLICABLE_CANDIDATE!>foo2<!>(42, <!UNRESOLVED_REFERENCE!>::bar1<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithReferenceAdaptation.fir.kt b/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithReferenceAdaptation.fir.kt
index 98f99688e36..823d1ce01f1 100644
--- a/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithReferenceAdaptation.fir.kt
+++ b/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionWithReferenceAdaptation.fir.kt
@@ -16,6 +16,6 @@ fun all(s: String = ""): Int = 0
 fun test() {
     unitCoercion(::foo)
     defaults(::bar)
-    <!INAPPLICABLE_CANDIDATE!>varargs<!>(::baz)
+    <!INAPPLICABLE_CANDIDATE!>varargs<!>(<!UNRESOLVED_REFERENCE!>::baz<!>)
     unitCoercionAndDefaults(::all)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.fir.kt
index 90bc8cff6ba..bf8a70fca07 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.fir.kt
@@ -5,9 +5,9 @@ import JavaClass
 
 fun foo(javaClass: JavaClass) {
     javaClass.somethingPublic
-    javaClass.<!INAPPLICABLE_CANDIDATE!>somethingProtected<!>
-    javaClass.<!INAPPLICABLE_CANDIDATE!>somethingPrivate<!>
-    javaClass.<!INAPPLICABLE_CANDIDATE!>somethingPackage<!>
+    javaClass.<!HIDDEN!>somethingProtected<!>
+    javaClass.<!HIDDEN!>somethingPrivate<!>
+    javaClass.<!HIDDEN!>somethingPackage<!>
     javaClass.somethingPublic = 1
 }
 
@@ -19,4 +19,4 @@ public class JavaClass {
     int getSomethingPackage() { return 1; }
 
     protected void setSomethingPublic(int value) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.fir.kt
index 1d33ecdeeb6..44f2393036a 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.fir.kt
@@ -4,13 +4,13 @@ package k
 import JavaClass
 
 fun foo(javaClass: JavaClass) {
-    val v = javaClass.<!INAPPLICABLE_CANDIDATE!>something<!>
-    javaClass.<!INAPPLICABLE_CANDIDATE!>something<!> = 1
-    javaClass.<!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>something<!><!UNRESOLVED_REFERENCE!>++<!>
+    val v = javaClass.<!HIDDEN!>something<!>
+    javaClass.<!HIDDEN!>something<!> = 1
+    javaClass.<!HIDDEN, HIDDEN!>something<!>++
 }
 
 // FILE: JavaClass.java
 public class JavaClass {
     protected int getSomething() { return 1; }
     public void setSomething(int value) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.fir.kt
index fadb8efd770..2a943c92954 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.fir.kt
@@ -4,7 +4,7 @@ package k
 import JavaClass
 
 fun foo(javaClass: JavaClass) {
-    javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething<!> { }
+    javaClass.<!HIDDEN!>doSomething<!> { }
 }
 
 // FILE: KotlinFile2.kt
@@ -15,4 +15,4 @@ fun foo(javaClass: JavaClass) {
 // FILE: JavaClass.java
 public class JavaClass {
     void doSomething(Runnable runnable) { runnable.run(); }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
index de8bd65a4ef..d9eb9e0a332 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
@@ -1,10 +1,10 @@
 // !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass) {
-    javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething<!> { }
+    javaClass.<!HIDDEN!>doSomething<!> { }
 }
 
 // FILE: JavaClass.java
 public class JavaClass {
     private void doSomething(Runnable runnable) { runnable.run(); }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.fir.kt
index 4b93a1419dc..65f214569b2 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.fir.kt
@@ -4,7 +4,7 @@ package k
 import JavaClass
 
 fun foo(javaClass: JavaClass) {
-    javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething<!> {
+    javaClass.<!HIDDEN!>doSomething<!> {
         bar()
     }
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
index 2f03f7e41dc..ed23a4d1942 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolution.fir.kt
@@ -32,5 +32,5 @@ fun x(a: A, r: Runnable) {
     a.bar(null as CharSequence?) checkType { _<String>() }
 
     a.bar("") checkType { _<String>() }
-    a.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
+    a.<!NONE_APPLICABLE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
index 6f8ef36d796..a66e900f753 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStatic.fir.kt
@@ -32,5 +32,5 @@ fun x(r: Runnable) {
     A.bar(null as CharSequence?) checkType { _<String>() }
 
     A.bar("") checkType { _<String>() }
-    A.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
+    A.<!NONE_APPLICABLE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
index 227af6c4a05..0ea1ab59559 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionStaticWithoutRefinedSams.fir.kt
@@ -33,5 +33,5 @@ fun x(r: Runnable) {
     A.bar(null as CharSequence?) checkType { _<String>() }
 
     A.bar("") checkType { _<String>() }
-    A.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
+    A.<!NONE_APPLICABLE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
index 6408291a5f0..d95da0b3322 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/overloadResolutionWithoutRefinedSams.fir.kt
@@ -33,5 +33,5 @@ fun x(a: A, r: Runnable) {
     a.bar(null as CharSequence?) checkType { _<String>() }
 
     a.bar("") checkType { _<String>() }
-    a.<!INAPPLICABLE_CANDIDATE!>bar<!>(123)
+    a.<!NONE_APPLICABLE!>bar<!>(123)
 }
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
index 0d2469cd512..bf7d1201236 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
@@ -5,13 +5,13 @@ abstract class A : Map<Int, String>
 fun foo(x: Map<Int, String>, a: A, b: java.util.HashMap<Int, String>) {
     x.getOrDefault(1, "")
     x.getOrDefault("", "")
-    x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
-    x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
+    x.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2)
+    x.<!NONE_APPLICABLE!>getOrDefault<!>("", 2)
 
     a.getOrDefault(1, "")
     a.getOrDefault("", "")
-    a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
-    a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
+    a.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2)
+    a.<!NONE_APPLICABLE!>getOrDefault<!>("", 2)
 
     b.getOrDefault(1, "")
     b.getOrDefault("", "")
diff --git a/compiler/testData/diagnostics/tests/typealias/privateInFile.fir.kt b/compiler/testData/diagnostics/tests/typealias/privateInFile.fir.kt
index c76aa214c7e..11605605936 100644
--- a/compiler/testData/diagnostics/tests/typealias/privateInFile.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/privateInFile.fir.kt
@@ -5,7 +5,7 @@ private class C {
 
 private typealias TA = C
 
-private val test1: C = <!INAPPLICABLE_CANDIDATE!>C<!>()
+private val test1: C = <!HIDDEN!>C<!>()
 private val test1co: C.Companion = C
 
 private val test2: TA = <!INAPPLICABLE_CANDIDATE!>TA<!>()
@@ -19,4 +19,4 @@ private val test2: TA = <!INAPPLICABLE_CANDIDATE!>TA<!>()
 private val test2co = TA
 
 private class C
-private typealias TA = Int
\ No newline at end of file
+private typealias TA = Int
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.fir.kt
index 098cb31bb3b..55a68b65027 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.fir.kt
@@ -9,7 +9,7 @@ val test2: TC = TC("")
 val test3: C = TC()
 val test4: TC = TC()
 
-val test5 = <!INAPPLICABLE_CANDIDATE!>TC<!>("", "")
+val test5 = <!NONE_APPLICABLE!>TC<!>("", "")
 
 interface Interface
 typealias TI = Interface
@@ -20,5 +20,5 @@ typealias TO = AnObject
 val test6 = <!UNRESOLVED_REFERENCE!>TI<!>()
 val test6a = <!UNRESOLVED_REFERENCE!>Interface<!>()
 
-val test7 = <!INAPPLICABLE_CANDIDATE!>TO<!>()
-val test7a = <!INAPPLICABLE_CANDIDATE!>AnObject<!>()
+val test7 = <!HIDDEN!>TO<!>()
+val test7a = <!HIDDEN!>AnObject<!>()
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.fir.kt
index 554340134b5..f39cf45ac14 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.fir.kt
@@ -12,8 +12,8 @@ val test2a = AnnotationClass()
 
 enum class EnumClass { VALUE1, VALUE2 }
 typealias Test3 = EnumClass
-val test3 = <!INAPPLICABLE_CANDIDATE!>Test3<!>()
-val test3a = <!INAPPLICABLE_CANDIDATE!>EnumClass<!>()
+val test3 = <!HIDDEN!>Test3<!>()
+val test3a = <!HIDDEN!>EnumClass<!>()
 
 sealed class SealedClass
 typealias Test4 = SealedClass
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
index 0fdf9492549..d46ab13a6f4 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
@@ -20,10 +20,10 @@ val test3 = MyAlias(1.0)
 val test3a = MyClass(1.0)
 
 class MyDerived : MyClass(1.0) {
-    val test4 = <!INAPPLICABLE_CANDIDATE!>MyAlias<!>(1)
-    val test4a = <!INAPPLICABLE_CANDIDATE!>MyClass<!>(1)
+    val test4 = <!NONE_APPLICABLE!>MyAlias<!>(1)
+    val test4a = <!NONE_APPLICABLE!>MyClass<!>(1)
     val test5 = MyAlias("")
     val test5a = MyClass("")
     val test6 = MyAlias(1.0)
     val test6a = MyClass(1.0)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt b/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
index be9c72b2297..ba4a1583d71 100644
--- a/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
+++ b/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.fir.kt
@@ -15,4 +15,4 @@ fun test(f: () -> String, s: SubInt) {
     <!INAPPLICABLE_CANDIDATE!>foo<!>(f)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(s)
     foo(::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt b/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
index 3b7720dce05..fc807ad7dd3 100644
--- a/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
+++ b/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.fir.kt
@@ -11,4 +11,4 @@ fun test(g: () -> Double, s: SubInt) {
     foo(::bar)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(g)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(s)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
index 3a7e5acc4ce..2d690688e04 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
@@ -49,12 +49,12 @@ fun manyFoo(vararg v: Int) {}
 fun manyFoo(vararg s: String) {}
 
 fun testMany(a: Any) {
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = 1)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = "")
+    <!NONE_APPLICABLE!>manyFoo<!>(v = 1)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = "")
 
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a as Int)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a as String)
-}
\ No newline at end of file
+    <!NONE_APPLICABLE!>manyFoo<!>(a)
+    <!NONE_APPLICABLE!>manyFoo<!>(v = a)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = a)
+    <!NONE_APPLICABLE!>manyFoo<!>(v = a as Int)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = a as String)
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
index 6ef4808f15d..f15cc442937 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
@@ -49,12 +49,12 @@ fun manyFoo(vararg v: Int) {}
 fun manyFoo(vararg s: String) {}
 
 fun testMany(a: Any) {
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = 1)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = "")
+    <!NONE_APPLICABLE!>manyFoo<!>(v = 1)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = "")
 
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a as Int)
-    <!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a as String)
-}
\ No newline at end of file
+    <!NONE_APPLICABLE!>manyFoo<!>(a)
+    <!NONE_APPLICABLE!>manyFoo<!>(v = a)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = a)
+    <!NONE_APPLICABLE!>manyFoo<!>(v = a as Int)
+    <!NONE_APPLICABLE!>manyFoo<!>(s = a as String)
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.fir.kt b/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.fir.kt
index ff170fe1c5a..6d630d02642 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.fir.kt
@@ -17,13 +17,13 @@ fun useMixedStringArgs3(fn: (String, Array<String>, String) -> Unit) = fn("foo",
 fun useTwoStringArrays(fn: (Array<String>, Array<String>) -> Unit) = fn(arrayOf("foo", "bar"), arrayOf("baz", "boo"))
 
 fun test() {
-    <!INAPPLICABLE_CANDIDATE!>useStrings<!>(::stringVararg)
+    <!INAPPLICABLE_CANDIDATE!>useStrings<!>(<!UNRESOLVED_REFERENCE!>::stringVararg<!>)
     useStringArray(::stringVararg)
     useIntArray(::numberVararg)
     usePrimitiveIntArray(::intVararg)
-    <!INAPPLICABLE_CANDIDATE!>useIntArray<!>(::intVararg)
-    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs1<!>(::stringVararg)
-    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs2<!>(::stringVararg)
-    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs3<!>(::stringVararg)
-    <!INAPPLICABLE_CANDIDATE!>useTwoStringArrays<!>(::stringVararg)
+    <!INAPPLICABLE_CANDIDATE!>useIntArray<!>(<!UNRESOLVED_REFERENCE!>::intVararg<!>)
+    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs1<!>(<!UNRESOLVED_REFERENCE!>::stringVararg<!>)
+    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs2<!>(<!UNRESOLVED_REFERENCE!>::stringVararg<!>)
+    <!INAPPLICABLE_CANDIDATE!>useMixedStringArgs3<!>(<!UNRESOLVED_REFERENCE!>::stringVararg<!>)
+    <!INAPPLICABLE_CANDIDATE!>useTwoStringArrays<!>(<!UNRESOLVED_REFERENCE!>::stringVararg<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.fir.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.fir.kt
index 66745afaede..8204ad96c10 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.fir.kt
@@ -33,5 +33,5 @@ class Test<in I> {
 }
 
 fun <I> test(t: Test<I>) {
-    t.apply(t.<!INAPPLICABLE_CANDIDATE!>foo<!>())
+    t.apply(t.<!HIDDEN!>foo<!>())
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.fir.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.fir.kt
index e5b46746182..43bb82c1c0b 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.fir.kt
@@ -33,5 +33,5 @@ class Test<in I, out O> {
 }
 
 fun <I, O> test(t: Test<I, O>) {
-    t.apply(t.<!INAPPLICABLE_CANDIDATE!>i<!>)
+    t.apply(t.<!HIDDEN!>i<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt
index e662794145d..27fc45a1594 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.fir.kt
@@ -33,5 +33,5 @@ class Test<in I, out O> {
 }
 
 fun <I, O> test(t: Test<I, O>) {
-    t.<!INAPPLICABLE_CANDIDATE!>i<!> = getT()
+    t.<!HIDDEN!>i<!> = getT()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt
index ca67e5f5c76..794cd08d94b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt
@@ -74,20 +74,20 @@ class Derived : Base() {
 
 class Other {
     fun test(base: Base, derived: Derived) {
-        base.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+        base.<!HIDDEN!>foo<!>()
         base.<!UNRESOLVED_REFERENCE!>gav<!>()
         base.<!UNRESOLVED_REFERENCE!>bar<!>()
-        derived.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+        derived.<!HIDDEN!>foo<!>()
         derived.<!UNRESOLVED_REFERENCE!>gav<!>()
         derived.<!UNRESOLVED_REFERENCE!>bar<!>()
     }
 }
 
 fun top(base: Base, derived: Derived) {
-    base.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    base.<!HIDDEN!>foo<!>()
     base.<!UNRESOLVED_REFERENCE!>bar<!>()
     base.<!UNRESOLVED_REFERENCE!>gav<!>()
-    derived.<!INAPPLICABLE_CANDIDATE!>foo<!>()
+    derived.<!HIDDEN!>foo<!>()
     derived.<!UNRESOLVED_REFERENCE!>bar<!>()
     derived.<!UNRESOLVED_REFERENCE!>gav<!>()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/callUsualContractFunction.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/callUsualContractFunction.fir.kt
index debe29d832a..4ccdc7ee1a2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/callUsualContractFunction.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/callUsualContractFunction.fir.kt
@@ -20,7 +20,7 @@ class SomeClass {
     }
 
     fun callMemberContractWithoutThis() {
-        <!INAPPLICABLE_CANDIDATE!>contract<!>()
+        <!NONE_APPLICABLE!>contract<!>()
     }
 
     fun callTopLevelSamePsiInMember() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
index c94a7379e3a..87486d2a91b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.fir.kt
@@ -8,6 +8,6 @@ class Scope<InterfaceT, ImplementationT : InterfaceT>(private val implClass: j.C
         val hm = c.asSequence()
             .<!INAPPLICABLE_CANDIDATE!>filter<!>(<!UNRESOLVED_REFERENCE!>implClass::isInstance<!>)
             .<!INAPPLICABLE_CANDIDATE!>map<!>(<!UNRESOLVED_REFERENCE!>implClass::cast<!>)
-            .<!AMBIGUITY!>toSet<!>()
+            .toSet()
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/suspendConversionForCallableReferences.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/suspendConversionForCallableReferences.fir.kt
index 110f7d31685..007a8e58ec5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/suspendConversionForCallableReferences.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/suspendConversionForCallableReferences.fir.kt
@@ -11,7 +11,7 @@ suspend fun String.id(): String = this
 fun box() {
     val x = "f"
     builder {
-        <!INAPPLICABLE_CANDIDATE!>go1<!>(x::id)
-        <!INAPPLICABLE_CANDIDATE!>go2<!>(x::id)
+        <!INAPPLICABLE_CANDIDATE!>go1<!>(<!UNRESOLVED_REFERENCE!>x::id<!>)
+        <!INAPPLICABLE_CANDIDATE!>go2<!>(<!UNRESOLVED_REFERENCE!>x::id<!>)
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.fir.kt
index 844ca85ec37..6e52c567b70 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.fir.kt
@@ -15,8 +15,8 @@ suspend fun bar(x: Int) {}
 
 fun test() {
     test0(::foo)
-    <!INAPPLICABLE_CANDIDATE!>test1<!>(::foo)
+    <!INAPPLICABLE_CANDIDATE!>test1<!>(<!UNRESOLVED_REFERENCE!>::foo<!>)
 
-    <!INAPPLICABLE_CANDIDATE!>test0<!>(::bar)
+    <!INAPPLICABLE_CANDIDATE!>test0<!>(<!UNRESOLVED_REFERENCE!>::bar<!>)
     test1(::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.fir.kt
index aee1b1c7925..c97c28694cc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt37309.fir.kt
@@ -11,14 +11,14 @@ fun <E> myBuildList(@BuilderInference builderAction: MutableList<E>.() -> Unit)
 @OptIn(ExperimentalStdlibApi::class)
 fun main() {
     val newList1 = myBuildList {
-        <!INAPPLICABLE_CANDIDATE!>addAll<!>(
+        addAll(
             listOf(1).map { <!INAPPLICABLE_CANDIDATE!>Foo<!>(null) }
         )
     }
 
     val newList2 = buildList {
-        <!INAPPLICABLE_CANDIDATE!>addAll<!>(listOf(1,2,3).map{ <!INAPPLICABLE_CANDIDATE!>Foo<!>(null) })
+        addAll(listOf(1,2,3).map{ <!INAPPLICABLE_CANDIDATE!>Foo<!>(null) })
     }
 }
 
-class Foo(val notNullProp: String)
\ No newline at end of file
+class Foo(val notNullProp: String)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
index c2013feafb8..d9965faf092 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
@@ -22,7 +22,7 @@ fun test() {
     builder {
         noParams()
         yieldString("abc") checkType { _<Unit>() }
-        <!INAPPLICABLE_CANDIDATE!>yieldString<!>(1) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
+        <!INAPPLICABLE_CANDIDATE!>yieldString<!>(1) checkType { _<Unit>() }
 
         await<String> { "123" } checkType { _<String>() }
 
@@ -36,7 +36,7 @@ fun test() {
 
         severalParams("", 89) checkType { _<Double>() }
         // TODO: should we allow somehow to call with passing continuation explicitly?
-        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, 6.9) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Unit>() }
+        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, 6.9) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
 
         "".stringReceiver(1)
         Any().anyReceiver(1)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
index edf2d483b96..4e5c8968405 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
@@ -23,7 +23,7 @@ fun test() {
     builder {
         noParams()
         yieldString("abc") checkType { _<Unit>() }
-        <!INAPPLICABLE_CANDIDATE!>yieldString<!>(1) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
+        <!INAPPLICABLE_CANDIDATE!>yieldString<!>(1) checkType { _<Unit>() }
 
         await<String> { "123" } checkType { _<String>() }
 
@@ -38,7 +38,7 @@ fun test() {
         severalParams("", 89) checkType { _<Double>() }
 
         // TODO: should we allow somehow to call with passing continuation explicitly?
-        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, 6.9) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
-        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, this as Continuation<Double>) <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
+        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, 6.9) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
+        <!INAPPLICABLE_CANDIDATE!>severalParams<!>("", 89, this as Continuation<Double>) checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Unit>() }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
index 9d743017c38..d017efdc4ba 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
@@ -28,8 +28,8 @@ fun <T, R> Iterable<T>.fooMap(t: (T) -> Sequence<R>): List<R> {
 }
 
 fun test() {
-    val list = ubyteArrayOf(0u).<!AMBIGUITY!>fooMap<!> { <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) }
+    val list = ubyteArrayOf(0u).<!AMBIGUITY!>fooMap<!> { <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) }
     takeUByteList(list)
 }
 
-fun takeUByteList(list: List<UByte>) {}
\ No newline at end of file
+fun takeUByteList(list: List<UByte>) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/suspendFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/suspendFunctions.fir.kt
index fee33cb29c0..e3a4c42ee63 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/suspendFunctions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/suspendFunctions.fir.kt
@@ -21,5 +21,5 @@ fun main() {
     // Here, the error should be
     val x2: (Int) -> Unit = takeSuspend(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit> & kotlin.Function1<kotlin.Int, kotlin.Unit>")!>id { <!UNRESOLVED_REFERENCE!>it<!> }<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Nothing, kotlin.Nothing>")!>{ x -> x }<!>)
     val x3: suspend (Int) -> Unit = takeSimpleFunction(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Int, kotlin.Unit> & kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id { <!UNRESOLVED_REFERENCE!>it<!> }<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Nothing, kotlin.Nothing>")!>{ x -> x }<!>)
-    val x4: (Int) -> Unit = <!INAPPLICABLE_CANDIDATE!>takeSimpleFunction<!>(id<suspend (Int) -> Unit> {}, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<kotlin.Unit>")!>{}<!>)
+    val x4: (Int) -> Unit = <!INAPPLICABLE_CANDIDATE!>takeSimpleFunction<!>(id<suspend (Int) -> Unit> {}, <!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>{}<!>)
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt
index e7ceb67e29a..13a8675f6c9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-fun foo(first: Array<Any?>, second: Array<Any?>) = <!INAPPLICABLE_CANDIDATE!>Pair<!>(first.<!INAPPLICABLE_CANDIDATE!>toCollection<!>(), second.<!INAPPLICABLE_CANDIDATE!>toCollection<!>())
\ No newline at end of file
+fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.<!INAPPLICABLE_CANDIDATE!>toCollection<!>(), second.<!INAPPLICABLE_CANDIDATE!>toCollection<!>())
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
index ab5614de074..a360a7cd9d9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
@@ -20,7 +20,7 @@ fun testArrays(ci: List<Int?>, cii: List<Int?>?) {
 
     checkSubtype<Array<Int?>>(c1)
     checkSubtype<Array<Int?>>(c2)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Array<Int?>>(c3)
+    checkSubtype<Array<Int?>>(c3)
     checkSubtype<Array<Int?>>(c4)
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Array<Int?>>(c5)
+    checkSubtype<Array<Int?>>(c5)
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
index 09ff515b7d4..428d894df0c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
@@ -24,7 +24,7 @@ public class StaticOverrides {
 // FILE: test.kt
 
 fun test() {
-    StaticOverrides.A.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
+    StaticOverrides.A.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Boolean>() }
     StaticOverrides.B.foo {} checkType { _<String>() }
-    StaticOverrides.C.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Boolean>() }
+    StaticOverrides.C.<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Boolean>() }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
index 68cd3929737..05a5ed0f4c9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
@@ -20,6 +20,6 @@ class Foo {
 
 // FILE: 1.kt
 fun test() {
-    Foo().<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    Foo().<!AMBIGUITY!>bar<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-}
\ No newline at end of file
+    Foo().<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+    Foo().<!AMBIGUITY!>bar<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
index 23b2268fa37..2d46f94bee1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
@@ -21,6 +21,6 @@ class Foo {
 
 // FILE: 1.kt
 fun test() {
-    Foo().<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-    Foo().<!AMBIGUITY!>bar<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
\ No newline at end of file
+    Foo().<!AMBIGUITY!>foo<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+    Foo().<!AMBIGUITY!>bar<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.fir.kt
index 394b4ee42b7..377b771ff37 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.fir.kt
@@ -16,5 +16,5 @@ public class Foo {
 
 // FILE: 1.kt
 fun bar() {
-    Foo().<!AMBIGUITY!>test<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
-}
\ No newline at end of file
+    Foo().<!AMBIGUITY!>test<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><String>() }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
index cacba88804e..9d5f49b6125 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
@@ -18,5 +18,5 @@ public class Foo {
 
 // FILE: 1.kt
 fun bar() {
-    Foo().<!AMBIGUITY!>test<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
\ No newline at end of file
+    Foo().<!AMBIGUITY!>test<!> {} <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.fir.kt
index 30f30de0207..9aef644def0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.fir.kt
@@ -3,7 +3,7 @@
 fun indexOfMax(a: IntArray): Int? {
     var maxI: Int? = 0
     a.forEachIndexed { i, value ->
-        if (value <!AMBIGUITY!>>=<!> <!INAPPLICABLE_CANDIDATE!>a[maxI]<!>) {
+        if (value >= <!INAPPLICABLE_CANDIDATE!>a[maxI]<!>) {
             maxI = i
         }
         else if (value < 0) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
index a02e5346146..bdffced2b4b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
@@ -28,7 +28,7 @@ interface A2 : List<String> {
     override fun stream(): java.util.stream.Stream<String> = null!!
 }
 
-class B : <!INAPPLICABLE_CANDIDATE!>Throwable<!>("", null, false, false)
+class B : <!NONE_APPLICABLE!>Throwable<!>("", null, false, false)
 
 class B1 : RuntimeException() {
     override fun fillInStackTrace(): Throwable { // 'override' keyword must be prohibited, as it was in 1.0.x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt
index 63c2639f042..a0a54e305f8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/typeAliasSamAdapterConstructors2.fir.kt
@@ -23,5 +23,5 @@ typealias C2<T> = JHost.Consumer2<T, T>
 val test1 = R { }
 val test2 = C<String> { s -> println(s.length) }
 val test3 = CStr { s -> <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }
-val test4 = CStrList { ss -> <!INAPPLICABLE_CANDIDATE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in ss) { <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }<!> }
+val test4 = CStrList { ss -> <!NONE_APPLICABLE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (s in ss) { <!AMBIGUITY!>println<!>(s.<!UNRESOLVED_REFERENCE!>length<!>) }<!> }
 val test5 = <!INAPPLICABLE_CANDIDATE!>C2<!><Int> { a, b -> val x: Int = a <!AMBIGUITY!>+<!> b; println(x)}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
index 1c01b530832..d6bb676ce71 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
@@ -24,20 +24,20 @@ val test3: MutableList<Int> =
 
 val test4: Collection<Int> =
         listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) {
-            <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+            <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
         }
 
 val test5: Collection<Int> =
         listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) { // TODO
-            if (true) <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+            if (true) <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
         }
 
 val test6: Collection<Int> =
         listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet<Int>()) {
-            if (true) <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
+            if (true) <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>) else <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>)
         }
 
 val test7: Collection<Int> =
         listOf(1, 2, 3).<!AMBIGUITY!>flatMapTo<!>(LinkedHashSet()) {
-            <!INAPPLICABLE_CANDIDATE!>select<!>(<!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>), <!INAPPLICABLE_CANDIDATE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>))
-        }
\ No newline at end of file
+            <!INAPPLICABLE_CANDIDATE!>select<!>(<!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>), <!NONE_APPLICABLE!>listOf<!>(<!UNRESOLVED_REFERENCE!>it<!>))
+        }
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/adaptedWithCoercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/adaptedWithCoercionToUnit.fir.txt
index a13c6d537c2..20403a99e73 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/adaptedWithCoercionToUnit.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/adaptedWithCoercionToUnit.fir.txt
@@ -34,8 +34,8 @@ FILE fqName:<root> fileName:/adaptedWithCoercionToUnit.kt
       RETURN type=kotlin.Nothing from='public final fun testV0 (): kotlin.Unit declared in <root>'
         CALL 'public final fun useUnit0 (fn: kotlin.Function0<kotlin.Unit>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
           fn: FUNCTION_REFERENCE 'public final fun fnv (vararg xs: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null reflectionTarget=<same>
-  FUN name:testV1 visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:testV1 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testV1 (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useUnit1]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun fnv (vararg xs: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
+      RETURN type=kotlin.Nothing from='public final fun testV1 (): kotlin.Unit declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useUnit1>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: fnv>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.txt
index d0e87f7db6c..fc801840aa4 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.txt
@@ -104,27 +104,47 @@ FILE fqName:<root> fileName:/caoWithAdaptationForSam.kt
         CONST Int type=kotlin.Int value=42
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+      BLOCK type=kotlin.Unit origin=null
+        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.A [val]
+          GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
+        VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.reflect.KFunction0<kotlin.Int> [val]
+          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null reflectionTarget=<same>
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /set>#' type=kotlin.Unit
+          GET_VAR 'val tmp_1: kotlin.reflect.KFunction0<kotlin.Int> [val] declared in <root>.test1' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /get>#' type=kotlin.Int
+              GET_VAR 'val tmp_1: kotlin.reflect.KFunction0<kotlin.Int> [val] declared in <root>.test1' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null
+            other: CONST Int type=kotlin.Int value=1
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+      BLOCK type=kotlin.Unit origin=null
+        VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:<root>.B [val]
+          GET_OBJECT 'CLASS OBJECT name:B modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.B
+        VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.reflect.KFunction0<kotlin.Int> [val]
+          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null reflectionTarget=<same>
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /set>#' type=kotlin.Unit
+          GET_VAR 'val tmp_3: kotlin.reflect.KFunction0<kotlin.Int> [val] declared in <root>.test2' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /get>#' type=kotlin.Int
+              GET_VAR 'val tmp_3: kotlin.reflect.KFunction0<kotlin.Int> [val] declared in <root>.test2' type=kotlin.reflect.KFunction0<kotlin.Int> origin=null
+            other: CONST Int type=kotlin.Int value=1
   FUN name:test3 visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=null
-        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.A [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_4 type:<root>.A [val]
           GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
-        VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_5 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
           GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
         CALL 'public final fun set (i: <root>.IFoo, newValue: kotlin.Int): kotlin.Unit [operator] declared in <root>' type=kotlin.Unit origin=null
-          $receiver: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test3' type=<root>.A origin=null
+          $receiver: GET_VAR 'val tmp_4: <root>.A [val] declared in <root>.test3' type=<root>.A origin=null
           i: TYPE_OP type=<root>.IFoo origin=SAM_CONVERSION typeOperand=<root>.IFoo
-            GET_VAR 'val tmp_1: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+            GET_VAR 'val tmp_5: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
           newValue: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
             $this: CALL 'public final fun get (i: <root>.IFoo): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
-              $receiver: GET_VAR 'val tmp_0: <root>.A [val] declared in <root>.test3' type=<root>.A origin=null
+              $receiver: GET_VAR 'val tmp_4: <root>.A [val] declared in <root>.test3' type=<root>.A origin=null
               i: TYPE_OP type=<root>.IFoo origin=SAM_CONVERSION typeOperand=<root>.IFoo
-                GET_VAR 'val tmp_1: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+                GET_VAR 'val tmp_5: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test3' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
             other: CONST Int type=kotlin.Int value=1
   FUN name:test4 visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
@@ -134,18 +154,18 @@ FILE fqName:<root> fileName:/caoWithAdaptationForSam.kt
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.IFoo
             GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.test4' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
           then: BLOCK type=kotlin.Unit origin=null
-            VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:<root>.A [val]
+            VAR IR_TEMPORARY_VARIABLE name:tmp_6 type:<root>.A [val]
               GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
-            VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:<root>.IFoo [val]
+            VAR IR_TEMPORARY_VARIABLE name:tmp_7 type:<root>.IFoo [val]
               TYPE_OP type=<root>.IFoo origin=IMPLICIT_CAST typeOperand=<root>.IFoo
                 GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.test4' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
             CALL 'public final fun set (i: <root>.IFoo, newValue: kotlin.Int): kotlin.Unit [operator] declared in <root>' type=kotlin.Unit origin=null
-              $receiver: GET_VAR 'val tmp_2: <root>.A [val] declared in <root>.test4' type=<root>.A origin=null
-              i: GET_VAR 'val tmp_3: <root>.IFoo [val] declared in <root>.test4' type=<root>.IFoo origin=null
+              $receiver: GET_VAR 'val tmp_6: <root>.A [val] declared in <root>.test4' type=<root>.A origin=null
+              i: GET_VAR 'val tmp_7: <root>.IFoo [val] declared in <root>.test4' type=<root>.IFoo origin=null
               newValue: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
                 $this: CALL 'public final fun get (i: <root>.IFoo): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
-                  $receiver: GET_VAR 'val tmp_2: <root>.A [val] declared in <root>.test4' type=<root>.A origin=null
-                  i: GET_VAR 'val tmp_3: <root>.IFoo [val] declared in <root>.test4' type=<root>.IFoo origin=null
+                  $receiver: GET_VAR 'val tmp_6: <root>.A [val] declared in <root>.test4' type=<root>.A origin=null
+                  i: GET_VAR 'val tmp_7: <root>.IFoo [val] declared in <root>.test4' type=<root>.IFoo origin=null
                 other: CONST Int type=kotlin.Int value=1
   FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
@@ -153,20 +173,20 @@ FILE fqName:<root> fileName:/caoWithAdaptationForSam.kt
       TYPE_OP type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=CAST typeOperand=kotlin.Function1<kotlin.Int, kotlin.Unit>
         GET_VAR 'a: kotlin.Any declared in <root>.test5' type=kotlin.Any origin=null
       BLOCK type=kotlin.Unit origin=null
-        VAR IR_TEMPORARY_VARIABLE name:tmp_4 type:<root>.A [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_8 type:<root>.A [val]
           GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
-        VAR IR_TEMPORARY_VARIABLE name:tmp_5 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_9 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
           TYPE_OP type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<kotlin.Int, kotlin.Unit>
             GET_VAR 'a: kotlin.Any declared in <root>.test5' type=kotlin.Any origin=null
         CALL 'public final fun set (i: <root>.IFoo, newValue: kotlin.Int): kotlin.Unit [operator] declared in <root>' type=kotlin.Unit origin=null
-          $receiver: GET_VAR 'val tmp_4: <root>.A [val] declared in <root>.test5' type=<root>.A origin=null
+          $receiver: GET_VAR 'val tmp_8: <root>.A [val] declared in <root>.test5' type=<root>.A origin=null
           i: TYPE_OP type=<root>.IFoo origin=SAM_CONVERSION typeOperand=<root>.IFoo
-            GET_VAR 'val tmp_5: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test5' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+            GET_VAR 'val tmp_9: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test5' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
           newValue: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
             $this: CALL 'public final fun get (i: <root>.IFoo): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
-              $receiver: GET_VAR 'val tmp_4: <root>.A [val] declared in <root>.test5' type=<root>.A origin=null
+              $receiver: GET_VAR 'val tmp_8: <root>.A [val] declared in <root>.test5' type=<root>.A origin=null
               i: TYPE_OP type=<root>.IFoo origin=SAM_CONVERSION typeOperand=<root>.IFoo
-                GET_VAR 'val tmp_5: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test5' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+                GET_VAR 'val tmp_9: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test5' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
             other: CONST Int type=kotlin.Int value=1
   FUN name:test6 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
@@ -177,16 +197,16 @@ FILE fqName:<root> fileName:/caoWithAdaptationForSam.kt
         TYPE_OP type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<kotlin.Int, kotlin.Unit>
           GET_VAR 'a: kotlin.Any declared in <root>.test6' type=kotlin.Any origin=null
       BLOCK type=kotlin.Unit origin=null
-        VAR IR_TEMPORARY_VARIABLE name:tmp_6 type:<root>.A [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_10 type:<root>.A [val]
           GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.A
-        VAR IR_TEMPORARY_VARIABLE name:tmp_7 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
+        VAR IR_TEMPORARY_VARIABLE name:tmp_11 type:kotlin.Function1<kotlin.Int, kotlin.Unit> [val]
           TYPE_OP type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function1<kotlin.Int, kotlin.Unit>
             GET_VAR 'a: kotlin.Any declared in <root>.test6' type=kotlin.Any origin=null
         CALL 'public final fun set (i: <root>.IFoo, newValue: kotlin.Int): kotlin.Unit [operator] declared in <root>' type=kotlin.Unit origin=null
-          $receiver: GET_VAR 'val tmp_6: <root>.A [val] declared in <root>.test6' type=<root>.A origin=null
-          i: GET_VAR 'val tmp_7: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test6' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+          $receiver: GET_VAR 'val tmp_10: <root>.A [val] declared in <root>.test6' type=<root>.A origin=null
+          i: GET_VAR 'val tmp_11: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test6' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
           newValue: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
             $this: CALL 'public final fun get (i: <root>.IFoo): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
-              $receiver: GET_VAR 'val tmp_6: <root>.A [val] declared in <root>.test6' type=<root>.A origin=null
-              i: GET_VAR 'val tmp_7: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test6' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+              $receiver: GET_VAR 'val tmp_10: <root>.A [val] declared in <root>.test6' type=<root>.A origin=null
+              i: GET_VAR 'val tmp_11: kotlin.Function1<kotlin.Int, kotlin.Unit> [val] declared in <root>.test6' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
             other: CONST Int type=kotlin.Int value=1
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.fir.txt
index 6a3247c9adc..933352ca8c9 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/constructorWithAdaptedArguments.fir.txt
@@ -66,21 +66,19 @@ FILE fqName:<root> fileName:/constructorWithAdaptedArguments.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:testConstructor visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:testConstructor visibility:public modality:FINAL <> () returnType:kotlin.Any
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testConstructor (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.C' type=kotlin.reflect.KFunction1<kotlin.IntArray, <root>.C> origin=null reflectionTarget=<same>
-  FUN name:testInnerClassConstructor visibility:public modality:FINAL <> (outer:<root>.Outer) returnType:IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun testConstructor (): kotlin.Any declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Any
+          ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: C>#' type=IrErrorType
+  FUN name:testInnerClassConstructor visibility:public modality:FINAL <> (outer:<root>.Outer) returnType:kotlin.Any
     VALUE_PARAMETER name:outer index:0 type:<root>.Outer
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testInnerClassConstructor (outer: <root>.Outer): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.Outer.Inner' type=kotlin.reflect.KFunction1<kotlin.IntArray, <root>.Outer.Inner> origin=null reflectionTarget=<same>
-            $this: GET_VAR 'outer: <root>.Outer declared in <root>.testInnerClassConstructor' type=<root>.Outer origin=null
-  FUN name:testInnerClassConstructorCapturingOuter visibility:public modality:FINAL <> () returnType:IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun testInnerClassConstructor (outer: <root>.Outer): kotlin.Any declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Any
+          ERROR_CALL 'Unsupported callable reference: R|<local>/outer|::<Unresolved reference: Inner>#' type=IrErrorType
+  FUN name:testInnerClassConstructorCapturingOuter visibility:public modality:FINAL <> () returnType:kotlin.Any
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testInnerClassConstructorCapturingOuter (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public constructor <init> (vararg xs: kotlin.Int) [primary] declared in <root>.Outer.Inner' type=kotlin.reflect.KFunction1<kotlin.IntArray, <root>.Outer.Inner> origin=null reflectionTarget=<same>
-            $this: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Outer' type=<root>.Outer origin=null
+      RETURN type=kotlin.Nothing from='public final fun testInnerClassConstructorCapturingOuter (): kotlin.Any declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Any
+          ERROR_CALL 'Unsupported callable reference: R|/Outer.Outer|()::<Unresolved reference: Inner>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.fir.txt
index 5cca1b0d2c3..5827e995583 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/suspendConversion.fir.txt
@@ -82,8 +82,8 @@ FILE fqName:<root> fileName:/suspendConversion.kt
               CALL 'public final fun foo2 (vararg xs: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
   FUN name:testWithVarargMapped visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendInt]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public final fun foo2 (vararg xs: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Unit> origin=null reflectionTarget=<same>
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendInt>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: foo2>#' type=IrErrorType
   FUN name:testWithCoercionToUnit visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       CALL 'public final fun useSuspend (fn: kotlin.coroutines.SuspendFunction0<kotlin.Unit>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt
index 6495ec3eb86..0efda6e1405 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/unboundMemberReferenceWithAdaptedArguments.fir.txt
@@ -59,16 +59,14 @@ FILE fqName:<root> fileName:/unboundMemberReferenceWithAdaptedArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:testUnbound visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use1]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public open fun foo (vararg xs: kotlin.Int): kotlin.Int declared in <root>.A' type=kotlin.reflect.KFunction2<<root>.A, kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use1>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: Q|A|::<Unresolved reference: foo>#' type=IrErrorType
   FUN name:testBound visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:<root>.A
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use2]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public open fun foo (vararg xs: kotlin.Int): kotlin.Int declared in <root>.A' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
-          $this: GET_VAR 'a: <root>.A declared in <root>.testBound' type=<root>.A origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use2>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: R|<local>/a|::<Unresolved reference: foo>#' type=IrErrorType
   FUN name:testObject visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use2]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public final fun foo (vararg xs: kotlin.Int): kotlin.Int declared in <root>.Obj' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
-          $this: GET_OBJECT 'CLASS OBJECT name:Obj modality:FINAL visibility:public superTypes:[<root>.A]' type=<root>.Obj
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use2>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: Q|Obj|::<Unresolved reference: foo>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.fir.txt
index 23e2f715fd3..4bdbb17c700 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptationForSam.fir.txt
@@ -27,5 +27,5 @@ FILE fqName:<root> fileName:/withAdaptationForSam.kt
         CONST Int type=kotlin.Int value=42
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useFoo]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useFoo>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: withVararg>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
index 6628be0fa48..e59ee184b04 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withAdaptedArguments.fir.txt
@@ -68,22 +68,21 @@ FILE fqName:<root> fileName:/withAdaptedArguments.kt
       RETURN type=kotlin.Nothing from='public final fun testDefault (): kotlin.String declared in <root>'
         CALL 'public final fun use (fn: kotlin.Function1<kotlin.Int, kotlin.String>): kotlin.String declared in <root>' type=kotlin.String origin=null
           fn: FUNCTION_REFERENCE 'public final fun fnWithDefault (a: kotlin.Int, b: kotlin.Int): kotlin.String declared in <root>' type=kotlin.reflect.KFunction1<kotlin.Int, kotlin.String> origin=null reflectionTarget=<same>
-  FUN name:testVararg visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:testVararg visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testVararg (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun fnWithVarargs (vararg xs: kotlin.Int): kotlin.String declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
+      RETURN type=kotlin.Nothing from='public final fun testVararg (): kotlin.String declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.String
+          ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: fnWithVarargs>#' type=IrErrorType
   FUN name:testCoercionToUnit visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testCoercionToUnit (): kotlin.Unit declared in <root>'
         CALL 'public final fun coerceToUnit (fn: kotlin.Function1<kotlin.Int, kotlin.Unit>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
           fn: FUNCTION_REFERENCE 'public final fun fnWithDefault (a: kotlin.Int, b: kotlin.Int): kotlin.String declared in <root>' type=kotlin.reflect.KFunction1<kotlin.Int, kotlin.Unit> origin=null reflectionTarget=<same>
-  FUN name:testImportedObjectMember visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:testImportedObjectMember visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testImportedObjectMember (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun importedObjectMemberWithVarargs (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: GET_OBJECT 'CLASS OBJECT name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Host
+      RETURN type=kotlin.Nothing from='public final fun testImportedObjectMember (): kotlin.String declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.String
+          ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: importedObjectMemberWithVarargs>#' type=IrErrorType
   FUN name:testDefault0 visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testDefault0 (): kotlin.String declared in <root>'
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.fir.txt
index 6d745578ef1..9ab9953e080 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withArgumentAdaptationAndReceiver.fir.txt
@@ -20,38 +20,33 @@ FILE fqName:<root> fileName:/withArgumentAdaptationAndReceiver.kt
     FUN name:testImplicitThis visibility:public modality:FINAL <> ($this:<root>.Host) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: GET_VAR '<this>: <root>.Host declared in <root>.Host.testImplicitThis' type=<root>.Host origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: withVararg>#' type=IrErrorType
     FUN name:testBoundReceiverLocalVal visibility:public modality:FINAL <> ($this:<root>.Host) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
       BLOCK_BODY
         VAR name:h type:<root>.Host [val]
           CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Host' type=<root>.Host origin=null
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: GET_VAR 'val h: <root>.Host [val] declared in <root>.Host.testBoundReceiverLocalVal' type=<root>.Host origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: R|<local>/h|::<Unresolved reference: withVararg>#' type=IrErrorType
     FUN name:testBoundReceiverLocalVar visibility:public modality:FINAL <> ($this:<root>.Host) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
       BLOCK_BODY
         VAR name:h type:<root>.Host [var]
           CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Host' type=<root>.Host origin=null
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: GET_VAR 'var h: <root>.Host [var] declared in <root>.Host.testBoundReceiverLocalVar' type=<root>.Host origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: R|<local>/h|::<Unresolved reference: withVararg>#' type=IrErrorType
     FUN name:testBoundReceiverParameter visibility:public modality:FINAL <> ($this:<root>.Host, h:<root>.Host) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
       VALUE_PARAMETER name:h index:0 type:<root>.Host
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: GET_VAR 'h: <root>.Host declared in <root>.Host.testBoundReceiverParameter' type=<root>.Host origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: R|<local>/h|::<Unresolved reference: withVararg>#' type=IrErrorType
     FUN name:testBoundReceiverExpression visibility:public modality:FINAL <> ($this:<root>.Host) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Host
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/use]>#' type=IrErrorType
-          FUNCTION_REFERENCE 'public final fun withVararg (vararg xs: kotlin.Int): kotlin.String declared in <root>.Host' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
-            $this: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Host' type=<root>.Host origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /use>#' type=kotlin.Unit
+          ERROR_CALL 'Unsupported callable reference: R|/Host.Host|()::<Unresolved reference: withVararg>#' type=IrErrorType
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
index 629043117f3..e482286b7be 100644
--- a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt
@@ -60,8 +60,8 @@ FILE fqName:<root> fileName:/withVarargViewedAsArray.kt
     BLOCK_BODY
   FUN name:testPlainArgs visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/usePlainArgs]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public final fun sum (vararg args: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.Int> origin=null reflectionTarget=<same>
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /usePlainArgs>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: sum>#' type=IrErrorType
   FUN name:testPrimitiveArrayAsVararg visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       CALL 'public final fun usePrimitiveArray (fn: kotlin.Function1<kotlin.IntArray, kotlin.Int>): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.fir.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.fir.txt
index 3fa5d7cbf61..bbc5a28e03e 100644
--- a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.fir.txt
+++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.fir.txt
@@ -59,5 +59,5 @@ FILE fqName:<root> fileName:/samConversionInVarargs.kt
         CONST String type=kotlin.String value=""
   FUN name:testAdaptedCR visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useVararg]>#' type=IrErrorType
-        FUNCTION_REFERENCE 'public final fun withVarargOfInt (vararg xs: kotlin.Int): kotlin.String declared in <root>' type=kotlin.reflect.KFunction1<kotlin.IntArray, kotlin.String> origin=null reflectionTarget=<same>
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useVararg>#' type=kotlin.Unit
+        ERROR_CALL 'Unsupported callable reference: ::<Unresolved reference: withVarargOfInt>#' type=IrErrorType
diff --git a/compiler/testData/ir/irText/expressions/kt28456a.fir.txt b/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
index 5d4746621d2..b566f6bef30 100644
--- a/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
@@ -26,7 +26,7 @@ FILE fqName:<root> fileName:/kt28456a.kt
   FUN name:testSimpleAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:<root>.A
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): /set>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=1
         CONST Int type=kotlin.Int value=2
         CONST Int type=kotlin.Int value=3
diff --git a/compiler/testData/ir/irText/expressions/kt28456b.fir.txt b/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
index ffdb443573d..c745d402ec4 100644
--- a/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
@@ -47,7 +47,7 @@ FILE fqName:<root> fileName:/kt28456b.kt
   FUN name:testSimpleAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:<root>.A
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): /set>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=1
         CONST Int type=kotlin.Int value=0
   FUN name:testPostfixIncrement visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Int
@@ -59,7 +59,7 @@ FILE fqName:<root> fileName:/kt28456b.kt
             CALL 'public final fun get (i: kotlin.Int, a: kotlin.Int, b: kotlin.Int, c: kotlin.Int, d: kotlin.Int): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
               $receiver: GET_VAR 'a: <root>.A declared in <root>.testPostfixIncrement' type=<root>.A origin=null
               i: CONST Int type=kotlin.Int value=1
-          ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
+          ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): /set>#' type=kotlin.Unit
             CONST Int type=kotlin.Int value=1
             CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.testPostfixIncrement' type=kotlin.Int origin=null
@@ -67,4 +67,15 @@ FILE fqName:<root> fileName:/kt28456b.kt
   FUN name:testCompoundAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:<root>.A
     BLOCK_BODY
-      ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+      BLOCK type=kotlin.Unit origin=null
+        VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:<root>.A [val]
+          GET_VAR 'a: <root>.A declared in <root>.testCompoundAssignment' type=<root>.A origin=null
+        VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val]
+          CONST Int type=kotlin.Int value=1
+        ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): /set>#' type=kotlin.Unit
+          GET_VAR 'val tmp_2: kotlin.Int [val] declared in <root>.testCompoundAssignment' type=kotlin.Int origin=null
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun get (i: kotlin.Int, a: kotlin.Int, b: kotlin.Int, c: kotlin.Int, d: kotlin.Int): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
+              $receiver: GET_VAR 'val tmp_1: <root>.A [val] declared in <root>.testCompoundAssignment' type=<root>.A origin=null
+              i: GET_VAR 'val tmp_2: kotlin.Int [val] declared in <root>.testCompoundAssignment' type=kotlin.Int origin=null
+            other: CONST Int type=kotlin.Int value=10
diff --git a/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt b/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
index 077e9d8cd54..a385b271c3a 100644
--- a/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
+++ b/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
@@ -27,27 +27,11 @@ FILE fqName:<root> fileName:/lambdaInCAO.kt
   FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
     BLOCK_BODY
-      BLOCK type=kotlin.Unit origin=null
-        VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Any [val]
-          GET_VAR 'a: kotlin.Any declared in <root>.test2' type=kotlin.Any origin=null
-        VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Function0<kotlin.Unit> [val]
-          FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test2'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-        CALL 'public final fun set (index: kotlin.Function0<kotlin.Unit>, value: kotlin.Int): kotlin.Unit [operator] declared in <root>' type=kotlin.Unit origin=null
-          $receiver: GET_VAR 'val tmp_0: kotlin.Any [val] declared in <root>.test2' type=kotlin.Any origin=null
-          index: GET_VAR 'val tmp_1: kotlin.Function0<kotlin.Unit> [val] declared in <root>.test2' type=kotlin.Function0<kotlin.Unit> origin=null
-          value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun get (index: kotlin.Function0<kotlin.Unit>): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
-              $receiver: GET_VAR 'val tmp_0: kotlin.Any [val] declared in <root>.test2' type=kotlin.Any origin=null
-              index: GET_VAR 'val tmp_1: kotlin.Function0<kotlin.Unit> [val] declared in <root>.test2' type=kotlin.Function0<kotlin.Unit> origin=null
-            other: CONST Int type=kotlin.Int value=42
+      ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
   FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
     BLOCK_BODY
-      VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val]
+      VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val]
         CALL 'public final fun get (index: kotlin.Function0<kotlin.Unit>): kotlin.Int [operator] declared in <root>' type=kotlin.Int origin=null
           $receiver: GET_VAR 'a: kotlin.Any declared in <root>.test3' type=kotlin.Any origin=null
           index: FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
@@ -63,5 +47,5 @@ FILE fqName:<root> fileName:/lambdaInCAO.kt
               RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test3'
                 GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
         value: CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
-          $this: GET_VAR 'val tmp_2: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
-      GET_VAR 'val tmp_2: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
+          $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
+      GET_VAR 'val tmp_0: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
diff --git a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt
index 244b909b2f8..290c443ca95 100644
--- a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/arrayAsVarargAfterSamArgument.kt
     VALUE_PARAMETER name:r index:1 type:java.lang.Runnable
     VALUE_PARAMETER name:arr index:2 type:kotlin.Array<kotlin.String>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Test.foo1]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /Test.foo1>#' type=kotlin.String?
         FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit
             BLOCK_BODY
@@ -21,7 +21,7 @@ FILE fqName:<root> fileName:/arrayAsVarargAfterSamArgument.kt
         strs: VARARG type=kotlin.Array<out kotlin.String?>? varargElementType=kotlin.String?
           SPREAD_ELEMENT
             GET_VAR 'arr: kotlin.Array<kotlin.String> declared in <root>.test' type=kotlin.Array<kotlin.String> origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Test.foo1]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /Test.foo1>#' type=kotlin.String?
         GET_VAR 'fn: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
         GET_VAR 'arr: kotlin.Array<kotlin.String> declared in <root>.test' type=kotlin.Array<kotlin.String> origin=null
       CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in <root>.Test' type=kotlin.String? origin=null
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/arrayAsVarargAfterSamArgument.kt
         r: GET_VAR 'r: java.lang.Runnable declared in <root>.test' type=java.lang.Runnable origin=null
         strs: VARARG type=kotlin.Array<out kotlin.String?>? varargElementType=kotlin.String?
           CONST String type=kotlin.String value=""
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Test.foo1]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /Test.foo1>#' type=kotlin.String?
         GET_VAR 'fn: kotlin.Function0<kotlin.Unit> declared in <root>.test' type=kotlin.Function0<kotlin.Unit> origin=null
         GET_VAR 'arr: kotlin.Array<kotlin.String> declared in <root>.test' type=kotlin.Array<kotlin.String> origin=null
       CALL 'public open fun foo1 (r: java.lang.Runnable?, vararg strs: kotlin.String?): kotlin.String? declared in <root>.Test' type=kotlin.String? origin=null
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/arrayAsVarargAfterSamArgument.kt
           SPREAD_ELEMENT
             GET_VAR 'arr: kotlin.Array<kotlin.String> declared in <root>.test' type=kotlin.Array<kotlin.String> origin=null
       VAR name:i1 type:IrErrorType [val]
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Test.Test, /Test.Test]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Ambiguity: Test, [/Test.Test, /Test.Test]>#' type=IrErrorType
           FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit
               BLOCK_BODY
@@ -68,7 +68,7 @@ FILE fqName:<root> fileName:/arrayAsVarargAfterSamArgument.kt
             SPREAD_ELEMENT
               GET_VAR 'arr: kotlin.Array<kotlin.String> declared in <root>.test' type=kotlin.Array<kotlin.String> origin=null
       VAR name:i3 type:IrErrorType [val]
-        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Test.Test, /Test.Test]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Ambiguity: Test, [/Test.Test, /Test.Test]>#' type=IrErrorType
           FUN_EXPR type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit
               BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
index f15facf43d1..1265dadb7d7 100644
--- a/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
+++ b/compiler/testData/ir/irText/expressions/sam/arrayAsVarargAfterSamArgument.kt
@@ -37,4 +37,4 @@ public class Test {
     }
     public Test(Runnable r, String... strs) {}
     public Test(Runnable r1, Runnable r2, String... strs) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
index 954101e48bb..b60ea9db1a7 100644
--- a/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samByProjectedType.fir.txt
@@ -1,10 +1,10 @@
 FILE fqName:<root> fileName:/samByProjectedType.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/H.bar]>#' type=IrErrorType
-        FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any> origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /H.bar>#' type=kotlin.Unit
+        FUN_EXPR type=kotlin.Function1<kotlin.Any, kotlin.Any?> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any?
             VALUE_PARAMETER name:x index:0 type:kotlin.Any
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any declared in <root>.test1'
+              RETURN type=kotlin.Nothing from='local final fun <anonymous> (x: kotlin.Any): kotlin.Any? declared in <root>.test1'
                 GET_VAR 'x: kotlin.Any declared in <root>.test1.<anonymous>' type=kotlin.Any origin=null
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
index f32a585d296..8c23723abba 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
@@ -88,13 +88,13 @@ FILE fqName:<root> fileName:/samConversionsWithSmartCasts.kt
     BLOCK_BODY
       TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
         GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/J.run1]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /J.run1>#' type=kotlin.Unit
         TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
           GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
   FUN name:test8 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/J.run1]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /J.run1>#' type=kotlin.Unit
         CALL 'public open fun id <T> (x: T of <root>.J.id?): T of <root>.J.id? declared in <root>.J' type=kotlin.Function0<kotlin.Unit>? origin=null
           <T>: kotlin.Function0<kotlin.Unit>?
           x: GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test8' type=kotlin.Function0<kotlin.Unit> origin=null
diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
index a23886530df..9ae545d9b20 100644
--- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
+++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
@@ -97,19 +97,19 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
     BLOCK_BODY
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUByte>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUByte>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUShort>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUShort>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=256
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUInt]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUInt>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeULong]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeULong>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUBytes]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /takeUBytes>#' type=kotlin.Unit
         CONST Int type=kotlin.Int value=255
         CONST Int type=kotlin.Int value=255
         CONST Int type=kotlin.UInt value=42
diff --git a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.fir.txt b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.fir.txt
index a96d6f7e020..8defa1e18cc 100644
--- a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.fir.txt
+++ b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.fir.txt
@@ -27,77 +27,77 @@ FILE fqName:<root> fileName:/suspendConversionOnArbitraryExpression.kt
   FUN name:testSimple visibility:public modality:FINAL <> (fn:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function0<kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspend]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspend>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function0<kotlin.Unit> declared in <root>.testSimple' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:testSimpleNonVal visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspend]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspend>#' type=kotlin.Unit
         CALL 'public final fun produceFun (): kotlin.Function0<kotlin.Unit> declared in <root>' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:testExtAsExt visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExt]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExt>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testExtAsExt' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testExtAsSimple visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendArg]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendArg>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testExtAsSimple' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testSimpleAsExt visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExt]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExt>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testSimpleAsExt' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testSimpleAsSimpleT visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendArgT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendArgT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testSimpleAsSimpleT' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testSimpleAsExtT visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExtT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExtT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testSimpleAsExtT' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testExtAsSimpleT visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendArgT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendArgT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testExtAsSimpleT' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testExtAsExtT visibility:public modality:FINAL <> (fn:kotlin.Function1<kotlin.Int, kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<kotlin.Int, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExtT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExtT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>.testExtAsExtT' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   FUN name:testSimpleSAsSimpleT visibility:public modality:FINAL <S> (fn:kotlin.Function1<S of <root>.testSimpleSAsSimpleT, kotlin.Unit>) returnType:kotlin.Unit
     TYPE_PARAMETER name:S index:0 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<S of <root>.testSimpleSAsSimpleT, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendArgT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendArgT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<S of <root>.testSimpleSAsSimpleT, kotlin.Unit> declared in <root>.testSimpleSAsSimpleT' type=kotlin.Function1<S of <root>.testSimpleSAsSimpleT, kotlin.Unit> origin=null
   FUN name:testSimpleSAsExtT visibility:public modality:FINAL <S> (fn:kotlin.Function1<S of <root>.testSimpleSAsExtT, kotlin.Unit>) returnType:kotlin.Unit
     TYPE_PARAMETER name:S index:0 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<S of <root>.testSimpleSAsExtT, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExtT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExtT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<S of <root>.testSimpleSAsExtT, kotlin.Unit> declared in <root>.testSimpleSAsExtT' type=kotlin.Function1<S of <root>.testSimpleSAsExtT, kotlin.Unit> origin=null
   FUN name:testExtSAsSimpleT visibility:public modality:FINAL <S> (fn:kotlin.Function1<S of <root>.testExtSAsSimpleT, kotlin.Unit>) returnType:kotlin.Unit
     TYPE_PARAMETER name:S index:0 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<S of <root>.testExtSAsSimpleT, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendArgT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendArgT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<S of <root>.testExtSAsSimpleT, kotlin.Unit> declared in <root>.testExtSAsSimpleT' type=kotlin.Function1<S of <root>.testExtSAsSimpleT, kotlin.Unit> origin=null
   FUN name:testExtSAsExtT visibility:public modality:FINAL <S> (fn:kotlin.Function1<S of <root>.testExtSAsExtT, kotlin.Unit>) returnType:kotlin.Unit
     TYPE_PARAMETER name:S index:0 variance: superTypes:[kotlin.Any?]
     VALUE_PARAMETER name:fn index:0 type:kotlin.Function1<S of <root>.testExtSAsExtT, kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspendExtT]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspendExtT>#' type=kotlin.Unit
         GET_VAR 'fn: kotlin.Function1<S of <root>.testExtSAsExtT, kotlin.Unit> declared in <root>.testExtSAsExtT' type=kotlin.Function1<S of <root>.testExtSAsExtT, kotlin.Unit> origin=null
   FUN name:testSmartCastWithSuspendConversion visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
     BLOCK_BODY
       TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
         GET_VAR 'a: kotlin.Any declared in <root>.testSmartCastWithSuspendConversion' type=kotlin.Any origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspend]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspend>#' type=kotlin.Unit
         TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
           GET_VAR 'a: kotlin.Any declared in <root>.testSmartCastWithSuspendConversion' type=kotlin.Any origin=null
   FUN name:testSmartCastOnVarWithSuspendConversion visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
@@ -107,7 +107,7 @@ FILE fqName:<root> fileName:/suspendConversionOnArbitraryExpression.kt
         GET_VAR 'a: kotlin.Any declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.Any origin=null
       TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
         GET_VAR 'var b: kotlin.Any [var] declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.Any origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/useSuspend]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /useSuspend>#' type=kotlin.Unit
         TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
           GET_VAR 'var b: kotlin.Any [var] declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.Any origin=null
   FUN name:testSmartCastVsSuspendConversion visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
diff --git a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
index 9d6b1f0c331..bc95af7482d 100644
--- a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
@@ -26,11 +26,13 @@ FILE fqName:<root> fileName:/whenWithSubjectVariable.kt
                 GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
               then: CONST Int type=kotlin.Int value=2
             BRANCH
-              if: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/ranges/IntRange.contains]>#' type=IrErrorType
+              if: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): kotlin/ranges/IntRange.contains>#' type=kotlin.Boolean
                 GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
               then: CONST Int type=kotlin.Int value=3
             BRANCH
-              if: ERROR_CALL 'Unresolved reference: <Unresolved name: not>#' type=IrErrorType
+              if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=null
+                $this: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): kotlin/ranges/IntRange.contains>#' type=kotlin.Boolean
+                  GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
               then: CONST Int type=kotlin.Int value=4
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
diff --git a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.8.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.8.fir.kt
index 7a00768ea8b..c1517834449 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.8.fir.kt
@@ -40,12 +40,12 @@ class Case1 : AbstractClassCase1(){
 
 fun case1(){
     val a = Case1()
-    a.<!INAPPLICABLE_CANDIDATE!>priv<!>()
+    a.<!HIDDEN!>priv<!>()
     a.prot()
     a.int()
     a.pub()
 
-    a.<!INAPPLICABLE_CANDIDATE!>priv1<!>
+    a.<!HIDDEN!>priv1<!>
     a.prot1
     a.int1
     a.pub1
@@ -59,12 +59,12 @@ import base.*
 // TESTCASE NUMBER: 2
 fun case2() {
     val a = Case1()
-    a.<!INAPPLICABLE_CANDIDATE!>priv<!>()
+    a.<!HIDDEN!>priv<!>()
     a.prot()
     a.int()
     a.pub()
 
-    a.<!INAPPLICABLE_CANDIDATE!>priv1<!>
+    a.<!HIDDEN!>priv1<!>
     a.prot1
     a.int1
     a.pub1
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.fir.kt
index dbf424495ff..197f9d17952 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.fir.kt
@@ -27,7 +27,7 @@ import checkSubtype
 fun case1() {
     val a: Any = true
     if (a) { "true" } else "false"
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Boolean>(a)
+    <!NONE_APPLICABLE!>checkSubtype<!><Boolean>(a)
 }
 
 /*
@@ -38,7 +38,7 @@ fun case1() {
 fun case2() {
     val a = JavaContainer.aO
     if (a) { "true" } else "false"
-    <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Boolean>(a)
+    <!NONE_APPLICABLE!>checkSubtype<!><Boolean>(a)
 }
 
 // TESTCASE NUMBER: 3
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.fir.kt
index af4d4e862de..d6afa98cfa2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.fir.kt
@@ -1,11 +1,11 @@
 // TESTCASE NUMBER: 1
 fun case_1() {
-    true checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean?>() }
-    false checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean?>() }
+    true checkType { <!NONE_APPLICABLE!>check<!><Boolean?>() }
+    false checkType { <!NONE_APPLICABLE!>check<!><Boolean?>() }
 
-    true checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Any?>() }
-    false checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Any>() }
+    true checkType { <!NONE_APPLICABLE!>check<!><Any?>() }
+    false checkType { <!NONE_APPLICABLE!>check<!><Any>() }
 
-    true checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Nothing?>() }
-    false checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Nothing>() }
+    true checkType { <!NONE_APPLICABLE!>check<!><Nothing?>() }
+    false checkType { <!NONE_APPLICABLE!>check<!><Nothing>() }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.fir.kt
index d3e6a866657..258dc53741d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.fir.kt
@@ -2,12 +2,12 @@
 
 // TESTCASE NUMBER: 1
 fun case_1() {
-    0L checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    1000000L checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Int>() }
-    0XAf10cDL checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Int>() }
-    0x0_0L checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    0b100_000_111_111L checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    0b0L checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
+    0L checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    1000000L checkType { <!NONE_APPLICABLE!>check<!><Int>() }
+    0XAf10cDL checkType { <!NONE_APPLICABLE!>check<!><Int>() }
+    0x0_0L checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    0b100_000_111_111L checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    0b0L checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(0L)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(1000000L)
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.fir.kt
index 30aec196a78..40f41bd4986 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.fir.kt
@@ -2,83 +2,83 @@
 
 // TESTCASE NUMBER: 1
 fun case_1() {
-    0 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    0 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    0 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    0 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    0 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    0 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 }
 
 // TESTCASE NUMBER: 2
 fun case_2() {
-    127 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    127 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    127 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    127 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    127 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    127 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(128)
-    128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    128 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    128 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    128 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
-    -128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    -128 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -128 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -128 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    -128 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-129)
-    -129 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -129 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    -129 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -129 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -129 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    -129 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 }
 
 // TESTCASE NUMBER: 3
 fun case_3() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(32767)
-    32767 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    32767 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    32767 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    32767 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    32767 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    32767 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(32768)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(32768)
-    32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    32768 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    32768 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    32768 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-32768)
-    -32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    -32768 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -32768 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -32768 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    -32768 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-32769)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(-32769)
-    -32769 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -32769 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    -32769 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -32769 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -32769 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    -32769 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 }
 
 // TESTCASE NUMBER: 4
 fun case_4() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(2147483647)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(2147483647)
-    2147483647 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    2147483647 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    2147483647 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    2147483647 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    2147483647 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    2147483647 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(2147483648)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(2147483648)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(2147483648)
-    2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Int>() }
+    2147483648 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    2147483648 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    2147483648 checkType { <!NONE_APPLICABLE!>check<!><Int>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-2147483648)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(-2147483648)
-    -2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    -2147483648 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -2147483648 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -2147483648 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    -2147483648 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-2147483649)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(-2147483649)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(-2147483649)
-    -2147483649 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -2147483649 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
+    -2147483649 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -2147483649 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
     -2147483649 checkType { check<Int>() }
 }
 
@@ -87,15 +87,15 @@ fun case_5() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(9223372036854775807)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(9223372036854775807)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(9223372036854775807)
-    9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Int>() }
+    9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
+    9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Int>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Byte>(-9223372036854775807)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(-9223372036854775807)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(-9223372036854775807)
-    -9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    -9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
+    -9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Byte>() }
+    -9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Short>() }
     -9223372036854775807 checkType { check<Int>() }
 }
 
@@ -105,8 +105,8 @@ fun case_6() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Short>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!>)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!>)
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!>)
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Byte>() }
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Short>() }
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Int>() }
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Byte>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Short>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Int>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.fir.kt
index 2288e362f16..393c857b1c3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.fir.kt
@@ -3,23 +3,23 @@
 // TESTCASE NUMBER: 1
 fun case_1() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!>)
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!>)
-    <!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!ILLEGAL_CONST_EXPRESSION!>9223372036854775808L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 }
 
 // TESTCASE NUMBER: 2
 fun case_2() {
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!>)
-    <!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!>)
-    <!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!>)
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000L<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Long>(<!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!>)
-    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    <!AMBIGUITY!>-<!><!ILLEGAL_CONST_EXPRESSION!>100000000000000000000000000000000l<!> <!INAPPLICABLE_CANDIDATE!>checkType<!> { <!NONE_APPLICABLE!>check<!><Long>() }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.fir.kt
index 6c3d05169a4..dd9ece5e2b2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.fir.kt
@@ -68,7 +68,7 @@ fun case_4() {
     checkSubtype<Int>(-2147483648)
     checkSubtype<Long>(-2147483648)
 
-    -2147483649 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -2147483649 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-2147483649)
 }
 
@@ -77,6 +77,6 @@ fun case_5() {
     9223372036854775807 checkType { check<Long>() }
     checkSubtype<Long>(9223372036854775807)
 
-    -9223372036854775807 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -9223372036854775807 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-9223372036854775807)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.fir.kt
index 576cd6457a8..62c9bcc60c7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.fir.kt
@@ -68,7 +68,7 @@ fun case_4() {
     checkSubtype<Int>(-0x80000000)
     checkSubtype<Long>(-0x80000000)
 
-    -0x80000001 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -0x80000001 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-0x80000001)
 }
 
@@ -77,6 +77,6 @@ fun case_5() {
     0X7FFFFFFFFFFFFFFF checkType { check<Long>() }
     checkSubtype<Long>(0X7FFFFFFFFFFFFFFF)
 
-    -0X7FFFFFFFFFFFFFFF checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -0X7FFFFFFFFFFFFFFF checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-0X7FFFFFFFFFFFFFFF)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.fir.kt
index b2c9aad6c50..4bac1e36f61 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.fir.kt
@@ -68,7 +68,7 @@ fun case_4() {
     checkSubtype<Int>(-0B10000000000000000000000000000000)
     checkSubtype<Long>(-0B10000000000000000000000000000000)
 
-    -0b10000000000000000000000000000001 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -0b10000000000000000000000000000001 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-0b10000000000000000000000000000001)
 }
 
@@ -77,6 +77,6 @@ fun case_5() {
     0b111111111111111111111111111111111111111111111111111111111111111 checkType { check<Long>() }
     checkSubtype<Long>(0b111111111111111111111111111111111111111111111111111111111111111)
 
-    -0B111111111111111111111111111111111111111111111111111111111111111 checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Long>() }
+    -0B111111111111111111111111111111111111111111111111111111111111111 checkType { <!NONE_APPLICABLE!>check<!><Long>() }
     checkSubtype<Long>(-0B111111111111111111111111111111111111111111111111111111111111111)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/neg/1.1.fir.kt
index 55f359e267b..cf2d070a07f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/neg/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/neg/1.1.fir.kt
@@ -26,7 +26,7 @@ fun case1() {
     val a: Boolean? = false
     checkSubtype<Boolean?>(a)
     val x4 = a && true
-    x4 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x4 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 2
@@ -34,7 +34,7 @@ fun case2() {
     val a: Any = false
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>a<!>
     val x4 = a && true
-    x4 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x4 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 3
@@ -46,7 +46,7 @@ fun case3() {
     val x3 = a1 && a2
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean")!>x3<!>
 
-    x3 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x3 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 4
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/pos/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/pos/1.1.fir.kt
index 3f8fc30d091..826f0cd7805 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/pos/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-conjunction-expression/p-2/pos/1.1.fir.kt
@@ -42,5 +42,5 @@ fun case1() {
     val x3 = a1 && a2 && a3 && a4 && a5 as Boolean
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean")!>x3<!>
 
-    x3 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>()}
+    x3 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>()}
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/neg/1.1.fir.kt
index d59c58591be..e67c169a61b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/neg/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/neg/1.1.fir.kt
@@ -26,7 +26,7 @@ fun case1() {
     val a: Boolean? = false
     checkSubtype<Boolean?>(a)
     val x4 = a || true
-    x4 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x4 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 2
@@ -34,7 +34,7 @@ fun case2() {
     val a: Any = false
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>a<!>
     val x4 = a || true
-    x4 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x4 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 3
@@ -46,7 +46,7 @@ fun case3() {
     val x3 = a1 || a2
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean")!>x3<!>
 
-    x3 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>() }
+    x3 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>() }
 }
 
 // TESTCASE NUMBER: 4
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/pos/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/pos/1.1.fir.kt
index 0ab07843503..5ed2a9bb3f0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/pos/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/logical-disjunction-expression/p-2/pos/1.1.fir.kt
@@ -42,5 +42,5 @@ fun case1() {
     val x3 = a1 || a2 || a3 || a4 || a5 as Boolean
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean")!>x3<!>
 
-    x3 <!AMBIGUITY!>checkType<!> { <!INAPPLICABLE_CANDIDATE!>check<!><Boolean>()}
+    x3 <!AMBIGUITY!>checkType<!> { <!NONE_APPLICABLE!>check<!><Boolean>()}
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/neg/1.1.fir.kt
index 5c35f534262..497a847ab43 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/neg/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/neg/1.1.fir.kt
@@ -11,7 +11,7 @@ class Case1() {
     }
 
     fun case() {
-        <!INAPPLICABLE_CANDIDATE!>Companion<!>(<!UNRESOLVED_REFERENCE!>::x<!>)
+        <!NONE_APPLICABLE!>Companion<!>(<!UNRESOLVED_REFERENCE!>::x<!>)
     }
 
     val x = ""
@@ -27,7 +27,7 @@ class Case2() {
     }
 
     fun case() {
-        <!INAPPLICABLE_CANDIDATE!>Companion<!>(<!UNRESOLVED_REFERENCE!>::x<!>)
+        <!NONE_APPLICABLE!>Companion<!>(<!UNRESOLVED_REFERENCE!>::x<!>)
     }
 
     val x = C()
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/pos/1.4.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/pos/1.4.fir.kt
index 4f9e6675147..58000bc1618 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/pos/1.4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/resolving-callable-references/bidirectional-resolution-for-callable-calls/p-3/pos/1.4.fir.kt
@@ -28,10 +28,10 @@ class Case2() {
     }
 
     fun case() {
-        <!INAPPLICABLE_CANDIDATE!>foo<!>(<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown"), UNRESOLVED_REFERENCE!>::invoke<!>, <!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown"), UNRESOLVED_REFERENCE!>::invoke<!>)
-        <!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)
-        <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(INAPPLICABLE): [/Case2.foo, /Case2.foo]")!><!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)<!>
+        <!NONE_APPLICABLE!>foo<!>(<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown"), UNRESOLVED_REFERENCE!>::invoke<!>, <!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown"), UNRESOLVED_REFERENCE!>::invoke<!>)
+        <!NONE_APPLICABLE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)
+        <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!NONE_APPLICABLE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Ambiguity: foo, [/Case2.foo, /Case2.foo]")!><!NONE_APPLICABLE!>foo<!>(<!UNRESOLVED_REFERENCE!>::invoke<!>, <!UNRESOLVED_REFERENCE!>::invoke<!>)<!>
     }
 
     fun foo(vararg x: (Int)->Any): String = TODO() // (1.1)
diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-contexts-and-scopes/inner-and-nested-type-contexts/p-1/pos/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-contexts-and-scopes/inner-and-nested-type-contexts/p-1/pos/1.1.fir.kt
index 24bc6b3ea93..d3f5851c91e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-contexts-and-scopes/inner-and-nested-type-contexts/p-1/pos/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-contexts-and-scopes/inner-and-nested-type-contexts/p-1/pos/1.1.fir.kt
@@ -22,7 +22,7 @@ class Case1<AT>(val x: AT) {
 
             when (k) {
                 is AT -> {
-                    k checkType { <!INAPPLICABLE_CANDIDATE!>check<!><AT>() }
+                    k checkType { <!NONE_APPLICABLE!>check<!><AT>() }
                 }
             }
         }
@@ -31,7 +31,7 @@ class Case1<AT>(val x: AT) {
             val k: AT = x!!
 
             if (k is AT) {
-                k checkType { <!INAPPLICABLE_CANDIDATE!>check<!><AT>() }
+                k checkType { <!NONE_APPLICABLE!>check<!><AT>() }
             }
         }
     }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/neg/2.1.fir.kt
index 380284e03eb..4417f42a6d7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/neg/2.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.nothing/p-1/neg/2.1.fir.kt
@@ -6,7 +6,7 @@
 class Case1(val nothing: Nothing)
 
 fun case1() {
-    val res = Case1(<!INAPPLICABLE_CANDIDATE!>Nothing<!>())
+    val res = <!INAPPLICABLE_CANDIDATE!>Case1<!>(<!INAPPLICABLE_CANDIDATE!>Nothing<!>())
 }
 
 
@@ -17,5 +17,5 @@ class Case2 {
 
 fun case2(c: Case2) {
     val testValue = c.data ?: throw IllegalArgumentException("data required")
-    testValue checkType { <!INAPPLICABLE_CANDIDATE!>check<!><Nothing>() }
+    testValue checkType { <!NONE_APPLICABLE!>check<!><Nothing>() }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
index 03cd6e2f5c6..f938331e4aa 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
@@ -29,13 +29,13 @@ fun case_4(value_1: Any?) {
 // TESTCASE NUMBER: 5
 fun case_5(value_1: String?) {
     funWithReturnsAndNullCheck(value_1)
-    <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 6
 fun case_6(value_1: String?) {
     funWithReturnsAndNullCheck(value_1)
-    <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 7
@@ -61,14 +61,14 @@ fun case_8(value_1: Any?) {
 
 // TESTCASE NUMBER: 9
 fun case_9(value_1: String?) {
-    if (!funWithReturnsTrue(value_1 != null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (!funWithReturnsTrueAndInvertCondition(value_1 == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (funWithReturnsFalse(value_1 != null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (funWithReturnsFalseAndInvertCondition(value_1 == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (!funWithReturnsTrue(value_1 != null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (!funWithReturnsTrueAndInvertCondition(value_1 == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (funWithReturnsFalse(value_1 != null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (funWithReturnsFalseAndInvertCondition(value_1 == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
     if (funWithReturnsNotNull(value_1 != null) == null) println(value_1.length)
     if (funWithReturnsNotNullAndInvertCondition(value_1 == null) == null) println(value_1.length)
-    if (funWithReturnsNull(value_1 != null) != null) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (funWithReturnsNullAndInvertCondition(value_1 == null) != null) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (funWithReturnsNull(value_1 != null) != null) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (funWithReturnsNullAndInvertCondition(value_1 == null) != null) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 10
@@ -83,14 +83,14 @@ fun case_10(value_1: Any?) {
 
 // TESTCASE NUMBER: 11
 fun case_11(value_1: Number?) {
-    if (!funWithReturnsTrueAndNotNullCheck(value_1)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (!funWithReturnsTrueAndNotNullCheck(value_1)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     if (!funWithReturnsTrueAndNullCheck(value_1)) println(value_1)
-    if (funWithReturnsFalseAndNotNullCheck(value_1)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (funWithReturnsFalseAndNotNullCheck(value_1)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     if (funWithReturnsFalseAndNullCheck(value_1)) println(value_1)
     if ((funWithReturnsNotNullAndNotNullCheck(value_1) == null)) println(value_1.toByte())
     if (!!!(funWithReturnsNotNullAndNotNullCheck(value_1) != null)) println(value_1.toByte())
     if (!!(funWithReturnsNotNullAndNullCheck(value_1) == null)) println(value_1)
-    if (!(funWithReturnsNullAndNotNullCheck(value_1) == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
-    if (!!(funWithReturnsNullAndNotNullCheck(value_1) != null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (!(funWithReturnsNullAndNotNullCheck(value_1) == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (!!(funWithReturnsNullAndNotNullCheck(value_1) != null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     if (!!!(funWithReturnsNullAndNullCheck(value_1) == null)) println(value_1)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
index ad770638750..8906c056c4d 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
@@ -250,8 +250,8 @@ fun case_8(value_1: Any?) {
 
 // TESTCASE NUMBER: 9
 fun case_9(value_1: Number?) {
-    if (!funWithReturnsTrueAndNullCheck(value_1)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
-    if (funWithReturnsFalseAndNullCheck(value_1)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (!funWithReturnsTrueAndNullCheck(value_1)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (funWithReturnsFalseAndNullCheck(value_1)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     if (funWithReturnsFalseAndNotNullCheck(value_1)) println(value_1)
     if (!(funWithReturnsNotNullAndNullCheck(value_1) != null)) println(value_1)
     if (!(funWithReturnsNullAndNullCheck(value_1) == null)) println(value_1)
@@ -458,9 +458,9 @@ fun case_19(value_1: Number) {
 // TESTCASE NUMBER: 20
 fun case_20(value_1: String?, value_2: String?, value_3: String?, value_4: String?) {
     if (!value_1.case_20_1()) println(value_1)
-    if (!value_2.case_20_2()) <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (!value_2.case_20_2()) println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
     when (value_3.case_20_3()) {
-        true -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        true -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
         false -> println(value_3)
     }
 }
@@ -468,13 +468,13 @@ fun case_20(value_1: String?, value_2: String?, value_3: String?, value_4: Strin
 // TESTCASE NUMBER: 21
 fun case_21(value_1: String?) {
     when { !value_1.case_21_1() -> println(value_1) }
-    when { !value_1.case_21_2() -> <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { !value_1.case_21_2() -> println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when {
         value_1.case_21_5() == null ->  println(value_1.length)
         value_1.case_21_5() != null ->  println(value_1)
     }
     when {
-        value_1.case_21_7() != null ->  <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        value_1.case_21_7() != null ->  println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
         value_1.case_21_7() == null ->  println(value_1)
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
index 3040e009cbc..b737b5d437f 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
@@ -30,14 +30,14 @@ import contracts.*
 // TESTCASE NUMBER: 1
 fun case_1(value: Any) {
     if (contracts.case_1_2(contracts.case_1_1(value is Char))) {
-        <!AMBIGUITY!>println<!>(value.<!INAPPLICABLE_CANDIDATE!>category<!>)
+        println(value.<!INAPPLICABLE_CANDIDATE!>category<!>)
     }
 }
 
 // TESTCASE NUMBER: 2
 fun case_2(value: Any) {
     if (contracts.case_2(value is Char) is Boolean) {
-        <!AMBIGUITY!>println<!>(value.<!INAPPLICABLE_CANDIDATE!>category<!>)
+        println(value.<!INAPPLICABLE_CANDIDATE!>category<!>)
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
index 27484e292cc..c6701562edf 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
@@ -152,7 +152,7 @@ fun case_2(value_1: Number) {
 // TESTCASE NUMBER: 3
 fun case_3(value_1: String?, value_2: String?) {
     value_1.case_3_1()
-    <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
     value_2.case_3_2()
     println(value_2)
 }
@@ -160,7 +160,7 @@ fun case_3(value_1: String?, value_2: String?) {
 // TESTCASE NUMBER: 4
 fun case_4(value_1: String?, value_2: String?) {
     value_1.case_4_1()
-    <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
     value_2.case_4_2()
     println(value_2)
 }
@@ -183,7 +183,7 @@ fun case_6(value_1: Number) {
 
 // TESTCASE NUMBER: 7
 fun case_7(value_1: String?, value_2: String?) {
-    if (value_1.case_7_1()) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (value_1.case_7_1()) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
     if (value_2.case_7_2()) println(value_2)
     if (!(value_2.case_7_3() == null)) println(value_2)
     if (value_2.case_7_3() == null) println(value_2)
@@ -191,7 +191,7 @@ fun case_7(value_1: String?, value_2: String?) {
 
 // TESTCASE NUMBER: 8
 fun case_8(value_1: String?, value_2: String?) {
-    when { value_1.case_8_1() -> <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_1.case_8_1() -> println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { value_2.case_8_2() -> println(value_2) }
     when { !(value_2.case_8_3() == null) -> println(value_2) }
     when { value_2.case_8_3() == null -> println(value_2) }
@@ -199,13 +199,13 @@ fun case_8(value_1: String?, value_2: String?) {
 
 // TESTCASE NUMBER: 9
 fun case_9(value_1: Number?) {
-    if (value_1?.case_9() == null) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (value_1?.case_9() == null) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
 }
 
 // TESTCASE NUMBER: 10
 fun case_10(value_1: Number?) {
     if (value_1?.case_10() == null) {
-        <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+        println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     } else {
         println(value_1.toByte())
     }
@@ -217,13 +217,13 @@ fun case_10(value_1: Number?) {
  */
 fun case_11(value_1: Number?, value_2: Number?) {
     if (value_1?.case_11_1() == null) {
-        <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+        println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     } else {
         println(value_1.toByte())
     }
     if (value_2?.case_11_2() != null) {
         println(value_2.toByte())
     } else {
-        <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+        println(value_2.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
index 0f28e64af95..3465ff56e1a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
@@ -125,7 +125,7 @@ fun case_2(value_1: Number?, value_2: Any?) {
 fun case_3(value_1: Any?, value_2: String?) {
     value_1.case_3(value_2)
     <!AMBIGUITY!>println<!>(value_1.inv())
-    <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 4
@@ -133,7 +133,7 @@ fun case_4(value_1: Any?, value_2: Number, value_3: Any?, value_4: String?) {
     value_1.case_4(value_2, value_3, value_4)
     <!AMBIGUITY!>println<!>(value_2.inv())
     <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>())
-    <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 5
@@ -182,19 +182,19 @@ fun case_6(value_1: Number?, value_2: Any?, value_3: Number?, value_4: Any?, val
 fun case_7(value_1: Any?, value_2: String?, value_3: Any?, value_4: String?, value_5: Any?, value_6: String?) {
     if (value_1.case_7_1(value_2)) {
         <!AMBIGUITY!>println<!>(value_1.inv())
-        <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_3.case_7_2(value_4)) {
         <!AMBIGUITY!>println<!>(value_3.inv())
-        <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_5.case_7_3(value_6) != null) {
         <!AMBIGUITY!>println<!>(value_5.inv())
-        <!AMBIGUITY!>println<!>(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_5.case_7_4(value_6) == null) {
         <!AMBIGUITY!>println<!>(value_5.inv())
-        <!AMBIGUITY!>println<!>(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
 }
 
@@ -202,14 +202,14 @@ fun case_7(value_1: Any?, value_2: String?, value_3: Any?, value_4: String?, val
 fun case_8(value_1: Any?, value_2: Number, value_3: Any?, value_4: String?) {
     when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_2.inv()) }
     when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_1.case_8_1(value_2, value_3, value_4) -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { !value_1.case_8_2(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_2.inv()) }
     when { !value_1.case_8_2(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { !value_1.case_8_2(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { !value_1.case_8_2(value_2, value_3, value_4) -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { value_1.case_8_3(value_2, value_3, value_4) == null -> <!AMBIGUITY!>println<!>(value_2.inv()) }
     when { value_1.case_8_3(value_2, value_3, value_4) == null -> <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_1.case_8_3(value_2, value_3, value_4) == null -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_1.case_8_3(value_2, value_3, value_4) == null -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { value_1.case_8_4(value_2, value_3, value_4) != null -> <!AMBIGUITY!>println<!>(value_2.inv()) }
     when { value_1.case_8_4(value_2, value_3, value_4) != null -> <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_1.case_8_4(value_2, value_3, value_4) != null -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_1.case_8_4(value_2, value_3, value_4) != null -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
index 47defcf0611..6a1acfce5e7 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
@@ -338,9 +338,9 @@ fun case_8(value_1: Any?) {
     }
     if (!case_8_4(value_1)) {
         value_1?.<!UNRESOLVED_REFERENCE!>toByte<!>()
-        if (<!UNRESOLVED_REFERENCE!>!<!><!INAPPLICABLE_CANDIDATE!>case_8_5<!>(value_1)) {
+        if (!<!INAPPLICABLE_CANDIDATE!>case_8_5<!>(value_1)) {
             value_1.<!UNRESOLVED_REFERENCE!>toByte<!>()
-            if (<!UNRESOLVED_REFERENCE!>!<!><!INAPPLICABLE_CANDIDATE!>case_8_6<!>(value_1)) value_1.inv()
+            if (!<!INAPPLICABLE_CANDIDATE!>case_8_6<!>(value_1)) value_1.inv()
         }
     }
     if (case_8_7(value_1) == null) {
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
index 4ce97b7f28c..839cfe16fc0 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
@@ -103,11 +103,11 @@ fun case_4(value_1: Number, value_2: (() -> Unit)?) {
 fun case_5(value_1: Number?, value_2: String?) {
     when (value_2.case_5(value_1)) {
         true -> {
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
             println(value_1.toByte())
         }
         false -> {
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
             <!AMBIGUITY!>println<!>(value_1.inv())
         }
     }
@@ -118,11 +118,11 @@ fun case_6(value_1: Number, value_2: String?, value_3: Any?) {
     when (value_3.case_6(value_1, value_2)) {
         true -> {
             println(value_3.equals(""))
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
         }
         false -> {
             <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>length<!>)
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
         }
         null -> {
             println(value_1.inv())
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/1.fir.kt
index 7cd53da885d..b3858186833 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/1.fir.kt
@@ -62,9 +62,9 @@ fun case_9(value_1: String?) {
     if (funWithReturnsTrueAndInvertCondition(value_1 == null)) println(value_1.length)
     if (!funWithReturnsFalse(value_1 != null)) println(value_1.length)
     if (!funWithReturnsFalseAndInvertCondition(value_1 == null)) println(value_1.length)
-    if (funWithReturnsNotNull(value_1 != null) != null) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (!(funWithReturnsNotNull(value_1 != null) == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
-    if (!(funWithReturnsNotNullAndInvertCondition(value_1 == null) == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (funWithReturnsNotNull(value_1 != null) != null) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (!(funWithReturnsNotNull(value_1 != null) == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    if (!(funWithReturnsNotNullAndInvertCondition(value_1 == null) == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 10
@@ -82,7 +82,7 @@ fun case_11(value_1: Number?, value_2: Int?) {
     if (!funWithReturnsFalseAndNotNullCheck(value_2)) value_2.inc()
     if (!funWithReturnsFalseAndNotNullCheck(value_1)) println(value_1.toByte())
     if (!funWithReturnsFalseAndNullCheck(value_1)) println(value_1)
-    if (!(funWithReturnsNotNullAndNotNullCheck(value_1) == null)) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
-    if (funWithReturnsNotNullAndNotNullCheck(value_1) != null) <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (!(funWithReturnsNotNullAndNotNullCheck(value_1) == null)) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
+    if (funWithReturnsNotNullAndNotNullCheck(value_1) != null) println(value_1.<!INAPPLICABLE_CANDIDATE!>toByte<!>())
     if (funWithReturnsNotNullAndNullCheck(value_1) != null) println(value_1)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
index 3c4a365270d..f19ea1c50c0 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
@@ -207,7 +207,7 @@ fun case_7(value_1: String?) {
         else println(value_1)
     when (value_1.case_7_6() == null) {
         true -> println(value_1)
-        false -> <!AMBIGUITY!>println<!>(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        false -> println(value_1.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_1.case_7_7() != null) println(value_1)
         else println(value_1.length)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/6.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/6.fir.kt
index 468cbc41bb9..2f93a5d0fd7 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/6.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/6.fir.kt
@@ -124,7 +124,7 @@ fun case_2(value_1: Number?, value_2: Any?) {
 fun case_3(value_1: Any?, value_2: String?) {
     value_1.case_3(value_2)
     <!AMBIGUITY!>println<!>(value_1.inv())
-    <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 4
@@ -132,7 +132,7 @@ fun case_4(value_1: Any?, value_2: Number, value_3: Any?, value_4: String?) {
     value_1.case_4(value_2, value_3, value_4)
     <!AMBIGUITY!>println<!>(value_2.inv())
     <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>())
-    <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
+    println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
 }
 
 // TESTCASE NUMBER: 5
@@ -187,19 +187,19 @@ fun case_6(value_1: Number?, value_2: Any?, value_3: Number?, value_4: Any?, val
 fun case_7(value_1: Any?, value_2: String?, value_3: Any?, value_4: String?, value_5: Any?, value_6: String?) {
     if (value_1.case_7_1(value_2)) {
         <!AMBIGUITY!>println<!>(value_1.inv())
-        <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_3.case_7_2(value_4)) {
         <!AMBIGUITY!>println<!>(value_3.inv())
-        <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_5.case_7_3(value_6) != null) {
         <!AMBIGUITY!>println<!>(value_5.inv())
-        <!AMBIGUITY!>println<!>(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
     if (value_5.case_7_4(value_6) == null) {
         <!AMBIGUITY!>println<!>(value_5.inv())
-        <!AMBIGUITY!>println<!>(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
+        println(value_6.<!INAPPLICABLE_CANDIDATE!>length<!>)
     }
 }
 
@@ -207,14 +207,14 @@ fun case_7(value_1: Any?, value_2: String?, value_3: Any?, value_4: String?, val
 fun case_8(value_1: Any?, value_2: Number, value_3: Any?, value_4: String?, value_5: Any?, value_6: Number, value_7: Any?, value_8: String?) {
     when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_2.inv()) }
     when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_3.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_1.case_8_1(value_2, value_3, value_4) -> <!AMBIGUITY!>println<!>(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_1.case_8_1(value_2, value_3, value_4) -> println(value_4.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { !value_5.case_8_2(value_6, value_7, value_8) -> <!AMBIGUITY!>println<!>(value_6.inv()) }
     when { !value_5.case_8_2(value_6, value_7, value_8) -> <!AMBIGUITY!>println<!>(value_7.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { !value_5.case_8_2(value_6, value_7, value_8) -> <!AMBIGUITY!>println<!>(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { !value_5.case_8_2(value_6, value_7, value_8) -> println(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { value_5.case_8_3(value_6, value_7, value_8) != null -> <!AMBIGUITY!>println<!>(value_6.inv()) }
     when { value_5.case_8_3(value_6, value_7, value_8) != null -> <!AMBIGUITY!>println<!>(value_7.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_5.case_8_3(value_6, value_7, value_8) != null -> <!AMBIGUITY!>println<!>(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_5.case_8_3(value_6, value_7, value_8) != null -> println(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
     when { value_5.case_8_4(value_6, value_7, value_8) == null -> <!AMBIGUITY!>println<!>(value_6.inv()) }
     when { value_5.case_8_4(value_6, value_7, value_8) == null -> <!AMBIGUITY!>println<!>(value_7.<!UNRESOLVED_REFERENCE!>toByte<!>()) }
-    when { value_5.case_8_4(value_6, value_7, value_8) == null -> <!AMBIGUITY!>println<!>(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
+    when { value_5.case_8_4(value_6, value_7, value_8) == null -> println(value_8.<!INAPPLICABLE_CANDIDATE!>length<!>) }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
index b4d00288a71..f9b7b8d157c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
@@ -111,7 +111,7 @@ fun case_5(value_1: Number?, value_2: String?) {
             println(value_1.toByte())
         }
         false -> {
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
             println(value_1.inv())
         }
     }
@@ -130,7 +130,7 @@ fun case_6(value_1: Number, value_2: String?, value_3: Any?) {
         }
         false -> {
             println(value_3.length)
-            <!AMBIGUITY!>println<!>(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
+            println(value_2.<!INAPPLICABLE_CANDIDATE!>length<!>)
         }
         null -> {
             <!AMBIGUITY!>println<!>(value_1.inv())
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
index b8f49568e01..5cd070dbb0a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.fir.kt
@@ -263,7 +263,7 @@ fun case_16() {
 // TESTCASE NUMBER: 17
 val case_17 = if (nullableIntProperty == null == true == false) 0 else {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>nullableIntProperty<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>nullableIntProperty<!>.<!INAPPLICABLE_CANDIDATE!>java<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>nullableIntProperty<!>.java
 }
 
 //TESTCASE NUMBER: 18
@@ -302,17 +302,17 @@ fun case_19(b: Boolean) {
         }
     } else null
 
-    if (a != null !is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!> != null is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!> != null is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!> != null == null && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!> != null !== null) {
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.equals(null)
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propAny
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propNullableAny
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funAny()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funNullableAny()
+    if (a != null !is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!> != null is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!> != null is Boolean && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!> != null == null && a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!> != null !== null) {
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propT
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableT
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableAny
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funT()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableT()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableAny()
     }
 }
 
@@ -361,34 +361,34 @@ fun case_21() {
 // TESTCASE NUMBER: 22
 fun case_22(a: (() -> Unit)?) {
     if (a != null !is Boolean) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>.funNullableAny()
     }
 }
 
 // TESTCASE NUMBER: 23
 fun case_23(a: ((Float) -> Int?)?, b: Float?) {
     if (a != null !is Boolean && b !== null is Boolean) {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
         if (x != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableAny()
         }
     }
 }
@@ -440,18 +440,18 @@ fun case_25(b: Boolean) {
 // TESTCASE NUMBER: 26
 fun case_26(a: ((Float) -> Int?)?, b: Float?) {
     if (a != null == true == false && b != null == true == false) {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
         if (x != null == true === false) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funNullableAny()
         }
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.fir.kt
index 98a0c759152..05ab6ad76a3 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.fir.kt
@@ -32,6 +32,6 @@ class Case5(val y: Any?): ClassWithCostructorParam(y as Interface1), Interface1
 fun case_6(a: Int?) = object : ClassWithCostructorParam(a!!) {
     fun run() = a.<!INAPPLICABLE_CANDIDATE!>toShort<!>()
     init {
-        <!AMBIGUITY!>println<!>(a.<!INAPPLICABLE_CANDIDATE!>toShort<!>())
+        println(a.<!INAPPLICABLE_CANDIDATE!>toShort<!>())
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/8.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/8.fir.kt
index 609fa3dcdb1..05b2ea29d44 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/8.fir.kt
@@ -8,8 +8,8 @@ fun case_1(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4()
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4().<!INAPPLICABLE_CANDIDATE!>fun_4<!>()
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4().<!INAPPLICABLE_CANDIDATE!>fun_4<!>().<!UNRESOLVED_REFERENCE!>fun_4<!>()
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4().<!INAPPLICABLE_CANDIDATE!>fun_4<!>().<!UNRESOLVED_REFERENCE!>fun_4<!>().<!UNRESOLVED_REFERENCE!>fun_4<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4().<!INAPPLICABLE_CANDIDATE!>fun_4<!>().<!INAPPLICABLE_CANDIDATE!>fun_4<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.fun_4().<!INAPPLICABLE_CANDIDATE!>fun_4<!>().<!INAPPLICABLE_CANDIDATE!>fun_4<!>().<!INAPPLICABLE_CANDIDATE!>fun_4<!>()
     }
 }
 
@@ -36,6 +36,6 @@ fun case_4(x: Class?) {
     if (x?.prop_8.also { } != null) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>fun_4<!>()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>fun_4<!>()
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/2.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/2.fir.kt
index 2faba557ee0..02c785698d2 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/2.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/2.fir.kt
@@ -67,7 +67,7 @@ fun case_3(b: Boolean) {
     val y = if (b) x else null
 
     if (false || false || false || false || y !== null) {
-        val z = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
+        val z = <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous>?")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
@@ -79,7 +79,7 @@ fun case_3(b: Boolean) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.funNullableAny()
 
         if (z != null || false) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.<!UNRESOLVED_REFERENCE!>a<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous>?")!>z<!>.<!INAPPLICABLE_CANDIDATE!>a<!>
         }
     }
 }
@@ -87,7 +87,7 @@ fun case_3(b: Boolean) {
 // TESTCASE NUMBER: 4
 fun case_4(a: ((Float) -> Int?)?, b: Float?) {
     if (a != null == true && b != null == true || false || false || false || false || false || false || false || false || false) {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
@@ -99,7 +99,7 @@ fun case_4(a: ((Float) -> Int?)?, b: Float?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.funNullableAny()
 
         if (false || x != null == true) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>
         }
     }
 }
@@ -125,16 +125,16 @@ fun case_5(b: Boolean) {
     } else null
 
     if (a != null && a.B5 != null && a.B5.C5 != null && a.B5.C5.D5 != null && a.B5.C5.D5.x != null && b || false) {
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.equals(null)
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.propAny
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.propNullableAny
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.funAny()
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!UNRESOLVED_REFERENCE!>C5<!>.<!UNRESOLVED_REFERENCE!>D5<!>.<!UNRESOLVED_REFERENCE!>x<!>.funNullableAny()
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propT
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableT
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableAny
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funT()
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableT()
+        a.<!INAPPLICABLE_CANDIDATE!>B5<!>.<!INAPPLICABLE_CANDIDATE!>C5<!>.<!INAPPLICABLE_CANDIDATE!>D5<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableAny()
     }
 }
 
@@ -274,7 +274,7 @@ fun case_11(b: Boolean) {
     val y = if (b) x else null
 
     if (y === null && true) else {
-        val z = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
+        val z = <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous>?")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<<anonymous>?>?")!>y<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
@@ -288,7 +288,7 @@ fun case_11(b: Boolean) {
         if (z != null || b) {
 
         } else {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous>?")!>z<!>
         }
     }
 }
@@ -298,7 +298,7 @@ fun case_12(a: ((Float) -> Int?)?, b: Float?, c: Boolean?) {
     if (true && a == null == true || b == null == true) {
 
     } else {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float & kotlin.Float?")!>b<!>)<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Float, kotlin.Int?>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
@@ -320,16 +320,16 @@ fun case_12(a: ((Float) -> Int?)?, b: Float?, c: Boolean?) {
         if (x == null == true || (c != null && !c)) {
 
         } else {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableAny()
         }
     }
 }
@@ -357,16 +357,16 @@ fun case_13(b: Boolean, c: Boolean, d: Boolean) {
     if ((a == null || a.B19 == null || a.B19.C19 == null || a.B19.C19.D19 == null || a.B19.C19.D19.x == null || b || c || !d) && true) {
 
     } else {
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.equals(null)
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propAny
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propNullableAny
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funAny()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!UNRESOLVED_REFERENCE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funNullableAny()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propT
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableT
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableAny
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funT()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableT()
+        a.<!INAPPLICABLE_CANDIDATE!>B19<!>.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableAny()
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.fir.kt
index 1990b2dc9cc..fc70e9530eb 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.fir.kt
@@ -12,8 +12,8 @@ fun case_1(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -28,7 +28,7 @@ fun case_2(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -57,8 +57,8 @@ fun case_4(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -73,7 +73,7 @@ fun case_5(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -102,8 +102,8 @@ fun case_7(x: Class) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -117,8 +117,8 @@ fun case_8(x: Class) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 // TESTCASE NUMBER: 9
@@ -136,8 +136,8 @@ fun <T> case_9(x: T) {
  */
 fun <T>case_10(x: Inv<T>?) {
     if (x!!.prop_1?.prop_1?.prop_1?.prop_2 != null) {
-        x.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_2<!>
-        x.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_2<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
+        x.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_2<!>
+        x.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_2<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
     }
 }
 
@@ -148,8 +148,8 @@ fun <T>case_10(x: Inv<T>?) {
  */
 inline fun <reified T>case_11(x: Inv<T>?) {
     if (x?.prop_1!!.prop_1?.prop_1?.prop_2 == null) else {
-        x.prop_1.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_2<!>
-        x.prop_1.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!UNRESOLVED_REFERENCE!>prop_2<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
+        x.prop_1.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_2<!>
+        x.prop_1.prop_1.<!INAPPLICABLE_CANDIDATE!>prop_1<!>.<!INAPPLICABLE_CANDIDATE!>prop_2<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.fir.kt
index cbbb80150a4..d2c30cd69ea 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.fir.kt
@@ -12,8 +12,8 @@ fun case_1(x: Any?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & kotlin.Any?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -27,8 +27,8 @@ fun case_2(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -41,9 +41,9 @@ fun case_3(x: Any?) {
     if ((x as Class?)?.prop_8?.prop_8?.prop_8?.prop_8 == null) else {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -56,9 +56,9 @@ fun case_4(x: Any?) {
     if ((x as Class?)!!.prop_8?.prop_8?.prop_8?.prop_8 == null) else {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class? & kotlin.Any?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -73,7 +73,7 @@ fun case_5(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
@@ -88,7 +88,7 @@ fun case_6(x: Class?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8
         <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.prop_8
-        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!UNRESOLVED_REFERENCE!>prop_8<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Class & Class?")!>x<!>.prop_8.prop_8.prop_8.<!INAPPLICABLE_CANDIDATE!>prop_8<!>.<!INAPPLICABLE_CANDIDATE!>prop_8<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.fir.kt
index 4614cf4b29f..9b62fcdd1c6 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.fir.kt
@@ -161,7 +161,7 @@ fun case_15(x: Any?) {
  */
 fun case_16(x: Nothing?) {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing?")!>x<!>?.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing")!>x!!<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & kotlin.Nothing?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing?")!>x<!>?.<!NONE_APPLICABLE!>equals<!>(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing")!>x!!<!>.<!NONE_APPLICABLE!>equals<!>(10)
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & kotlin.Nothing?")!>x<!>.<!NONE_APPLICABLE!>equals<!>(10)
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/7.fir.kt
index 8a90ac07e8f..f0c2ef2fb9f 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/7.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/7.fir.kt
@@ -344,17 +344,17 @@ fun case_19(b: Boolean) {
         }
     } else null
 
-    if (a != null && a.B19 != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!> != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!> != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!> != a.y) {
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.equals(null)
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propAny
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.propNullableAny
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funAny()
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!UNRESOLVED_REFERENCE!>D19<!>.<!UNRESOLVED_REFERENCE!>x<!>.funNullableAny()
+    if (a != null && a.B19 != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!> != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!> != a.y && a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!> != a.y) {
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propT
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableT
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.propNullableAny
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funT()
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableT()
+        a.B19.<!INAPPLICABLE_CANDIDATE!>C19<!>.<!INAPPLICABLE_CANDIDATE!>D19<!>.<!INAPPLICABLE_CANDIDATE!>x<!>.funNullableAny()
     }
 }
 
@@ -406,7 +406,7 @@ fun case_21() {
 fun case_22(a: (() -> Unit)?) {
     var y = null
     if (a != null || y != a) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!><!INAPPLICABLE_CANDIDATE!>a<!>()<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<kotlin.Unit>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<kotlin.Unit>?")!>a<!>.propT
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function0<kotlin.Unit>?")!>a<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
@@ -422,18 +422,18 @@ fun case_22(a: (() -> Unit)?) {
 // TESTCASE NUMBER: 23
 fun case_23(a: ((Float) -> Int?)?, b: Float?, c: Nothing?) {
     if (a != null && b !== null || a != c && b !== c) {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
         if (x != null || c !== x) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propT<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propNullableT<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funT<!>()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funNullableT<!>()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>equals<!>(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>propAny<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.<!INAPPLICABLE_CANDIDATE!>funAny<!>()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!>.funNullableAny()
         }
     }
 }
@@ -475,19 +475,19 @@ fun case_25(b: Boolean) {
 
     if (y !== null || x()!!.b != y) {
         if (x()!!.b != y) {
-            val z = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
+            val z = <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous>?")!><!INAPPLICABLE_CANDIDATE!>y<!>()<!>
 
             if (z != null) {
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.<!UNRESOLVED_REFERENCE!>a<!>
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.equals(null)
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.propT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.propAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.propNullableT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.propNullableAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.funT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.funAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.funNullableT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function0.invoke]")!>z<!>.funNullableAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.a
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.equals(null)
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.propT
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.propAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.propNullableT
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.propNullableAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.funT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.funAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.funNullableT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("<anonymous> & <anonymous>?")!>z<!>.funNullableAny()
             }
         }
     }
@@ -498,18 +498,18 @@ fun case_26(a: ((Float) -> Int?)?, b: Float?) {
     var c: Nothing? = null
 
     if (a != null == true && b != null == true || c != a == true && b != c == true) {
-        val x = <!DEBUG_INFO_EXPRESSION_TYPE("ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
+        val x = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!><!INAPPLICABLE_CANDIDATE!>a<!>(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float?")!>b<!>)<!>
         if (x != null == true) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke] & ERROR CLASS: Inapplicable(WRONG_RECEIVER): [kotlin/Function1.invoke]")!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>.funNullableAny()
         }
     }
 }