From 38f4a35be2f8900cf28d48205b14a3096e5f3b09 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 24 Jun 2022 10:52:58 +0200
Subject: [PATCH] FIR: introduce flexible types pretty rendering for no
 arguments case

#KT-52020 Fixed
---
 .../resolveCall/javaPropertyNestedGetter.txt  |  4 +-
 .../resolveCall/samConstructorCall.txt        |  8 ++--
 .../singleCandidate/samConstructorCall.txt    |  8 ++--
 .../samAsConstructorArgument.txt              |  2 +-
 .../scopes/memberScopeByFqName/enumEntry.txt  |  2 +-
 .../memberScopeByFqName/java.lang.String.txt  | 42 +++++++++----------
 .../symbols/symbolByFqName/classFromJdk.txt   |  2 +-
 .../enhancement/jsr305/NonNullNever.fir.txt   |  2 +-
 .../enhancement/jsr305/Strange.fir.txt        |  2 +-
 .../FieldsAreNullable.fir.txt                 |  4 +-
 .../ForceFlexibility.fir.txt                  |  4 +-
 .../ForceFlexibleOverOverrides.fir.txt        |  2 +-
 .../NullabilityFromOverridden.fir.txt         | 26 ++++++------
 .../OverridingDefaultQualifier.fir.txt        | 30 ++++++-------
 .../ParametersAreNonnullByDefault.fir.txt     |  2 +-
 ...rametersAreNonnullByDefaultPackage.fir.txt |  4 +-
 .../SpringNullable.fir.txt                    |  8 ++--
 .../SpringNullablePackage.fir.txt             |  8 ++--
 .../enhancement/mapping/AbstractMap.fir.txt   |  2 +-
 .../loadCompiledKotlin/type/Platform.txt      |  7 ++--
 .../resolve/arguments/kt41940.fir.txt         |  2 +-
 .../resolve/arguments/lambdaInLambda2.fir.txt |  2 +-
 .../exhaustiveWhenAndFlexibleType.fir.txt     |  4 +-
 .../expresssions/genericDiagnostic.fir.txt    |  2 +-
 .../expresssions/javaFieldCallable.fir.txt    |  4 +-
 .../expresssions/outerMemberAccesses.fir.txt  |  4 +-
 .../flexibleTypeBug.fir.txt                   |  4 +-
 .../inference/dnnThrowJavaCall.fir.txt        |  2 +-
 .../integerLiteralAsComparable.fir.txt        |  2 +-
 .../resolve/javaFieldVsAccessor.fir.txt       |  2 +-
 .../javaStaticScopeInheritance.fir.txt        |  2 +-
 .../offOrderMultiBoundGenericOverride.fir.txt |  2 +-
 .../flexibleTypeVarAgainstNull.fir.txt        |  2 +-
 .../properties/javaAccessorConversion.fir.txt |  4 +-
 .../testData/resolve/rawTypeSam.fir.txt       |  2 +-
 .../samConstructors/genericSam.fir.txt        |  4 +-
 .../genericSamInferenceFromExpectType.fir.txt | 10 ++---
 .../resolve/samConversions/genericSam.fir.txt | 10 ++---
 .../samSupertypeWithOverride.fir.txt          |  4 +-
 .../samConversions/samWithEquals.fir.txt      |  2 +-
 ...citOverrideOfTwoMembers_java.overrides.txt |  4 +-
 ...terOverrideAndKotlinProperty.overrides.txt |  8 ++--
 ...ublicJavaAndPrivateKotlinVar.overrides.txt |  8 ++--
 .../specialFunctionInJava_2.overrides.txt     | 24 +++++------
 .../testData/resolve/spreadOperator.fir.txt   |  4 +-
 .../j+k/ArrayInGenericArguments.fir.txt       |  4 +-
 .../stdlib/j+k/flexibleWildcard.fir.txt       |  4 +-
 .../testData/resolve/treeSet.fir.txt          |  2 +-
 .../referenceToJavaStdlib.fir.txt             |  2 +-
 .../inference/flexibleTypeInSystem.fir.txt    |  4 +-
 .../intellij/FieldVsSyntheticAccessor.fir.txt |  6 +--
 .../IntersectionWithJavaString.fir.txt        |  2 +-
 .../j+k/BasicWithJavaFakeOverride.fir.txt     |  2 +-
 .../j+k/BasicWithPrimitiveJava.fir.txt        |  2 +-
 .../j+k/FunctionTypeInJava.fir.txt            |  8 ++--
 .../j+k/IntersectionTypesProblem.fir.txt      |  2 +-
 .../j+k/JavaGetPrefixConflict.fir.txt         |  4 +-
 .../j+k/JavaSyntheticProperty.fir.txt         |  4 +-
 .../j+k/KJKInheritanceGeneric.fir.txt         |  2 +-
 .../j+k/KotlinClassParameterGeneric.fir.txt   |  2 +-
 .../j+k/LoggerInstance.fir.txt                |  6 +--
 .../resolveWithStdlib/j+k/MapEntry.fir.txt    |  4 +-
 .../resolveWithStdlib/j+k/MyException.fir.txt |  6 +--
 .../resolveWithStdlib/j+k/MyIterable.fir.txt  |  4 +-
 .../resolveWithStdlib/j+k/MyMap.fir.txt       | 12 +++---
 .../j+k/StaticFromBaseClass.fir.txt           |  2 +-
 .../j+k/StaticGenericMethod.fir.txt           |  2 +-
 .../j+k/SyntheticWithForEach.fir.txt          |  8 ++--
 .../j+k/capturedFlexible.fir.txt              |  2 +-
 .../j+k/complexFlexibleInference.fir.txt      |  2 +-
 .../javaLangComparator.fir.txt                |  2 +-
 .../kotlinComparatorAlias.fir.txt             |  2 +-
 .../problems/definitelyNotNullCast.fir.txt    |  2 +-
 .../problems/immutableName.overrides.txt      | 13 +++---
 .../samForComparator.fir.txt                  |  2 +-
 .../kotlin/fir/types/TypeRenderer.kt          | 18 +++++++-
 .../testData/cli/jvm/firDeprecationJava.out   |  4 +-
 .../ArrayInGenericArguments.fir.txt           | 10 ++---
 .../compiledJava/ArrayTypeVariance.fir.txt    |  2 +-
 .../compiledJava/ClassWithTypeP.fir.txt       |  4 +-
 .../ClassWithTypePExtendsIterableP.fir.txt    |  4 +-
 .../compiledJava/ClassWithTypePP.fir.txt      |  4 +-
 .../ClassWithTypePRefNext.fir.txt             |  4 +-
 .../compiledJava/FieldOfArrayType.fir.txt     |  2 +-
 ...InheritMethodsDifferentReturnTypes.fir.txt |  8 ++--
 ...MethodsDifferentReturnTypesGeneric.fir.txt |  6 +--
 .../InnerClassReferencesOuterTP.fir.txt       |  6 +--
 .../InnerClassTypeMultipleGeneric.fir.txt     | 20 ++++-----
 .../InnerClassesInGeneric.fir.txt             |  8 ++--
 .../compiledJava/InnerOfGeneric.fir.txt       | 16 +++----
 .../IntrinsicCompanionObject.fir.txt          | 10 ++---
 .../MethodReferencesOuterClassTP.fir.txt      |  6 +--
 .../MethodTypePOneUpperBound.fir.txt          |  2 +-
 .../MethodTypePTwoUpperBounds.fir.txt         |  2 +-
 .../compiledJava/MethodWithTypeP.fir.txt      |  2 +-
 .../compiledJava/MethodWithTypePP.fir.txt     |  2 +-
 .../MethodWithTypePRefClassP.fir.txt          |  4 +-
 .../compiledJava/MethosWithPRefTP.fir.txt     |  2 +-
 .../loadJava/compiledJava/MyException.fir.txt |  2 +-
 .../compiledJava/OverrideMethod.fir.txt       |  4 +-
 .../PackageLocalVisibility.fir.txt            |  4 +-
 .../compiledJava/RawOverrides.fir.txt         | 14 +++----
 .../RawTypeWithUpperBound.fir.txt             |  6 +--
 .../RemoveRedundantProjectionKind.fir.txt     |  4 +-
 .../compiledJava/TopLevel$Class.fir.txt       |  2 +-
 .../compiledJava/UnboundWildcard.fir.txt      |  2 +-
 .../compiledJava/WildcardBounds.fir.txt       |  6 +--
 ...edParameterInInnerClassConstructor.fir.txt |  6 +--
 .../annotations/AnnotatedTypeInFun.fir.txt    |  2 +-
 .../AnnotatedValueParameter.fir.txt           |  2 +-
 .../ClassObjectArrayInParam.fir.txt           |  2 +-
 .../annotations/ClassObjectInParam.fir.txt    |  2 +-
 .../annotations/ClassObjectInParamRaw.fir.txt |  2 +-
 .../ClassObjectInParamVariance.fir.txt        |  2 +-
 .../annotations/CustomAnnotation.fir.txt      |  2 +-
 .../EnumArgumentWithCustomToString.fir.txt    |  2 +-
 .../EnumConstructorParameter.fir.txt          |  4 +-
 .../annotations/JavaDocDeprecated.fir.txt     |  2 +-
 .../annotations/NestedEnumArgument.fir.txt    |  2 +-
 .../ConstructorGenericDeep.fir.txt            |  2 +-
 .../ConstructorGenericSimple.fir.txt          |  2 +-
 .../ConstructorGenericUpperBound.fir.txt      |  2 +-
 .../compiledJava/enum/EnumMembers.fir.txt     |  2 +-
 .../enum/EnumWithSpecializedEntry.fir.txt     |  2 +-
 .../compiledJava/enum/JavaEnum.fir.txt        |  2 +-
 .../javaBean/DifferentGetterAndSetter.fir.txt |  2 +-
 .../compiledJava/javaBean/JavaBeanVal.fir.txt |  2 +-
 .../compiledJava/javaBean/JavaBeanVar.fir.txt |  4 +-
 .../javaBean/JavaBeanVarOfGenericType.fir.txt |  4 +-
 .../compiledJava/javaBean/TwoSetters.fir.txt  |  2 +-
 .../kotlinSignature/AllBoundsInWhen.fir.txt   |  2 +-
 .../kotlinSignature/ArrayType.fir.txt         |  2 +-
 .../ConstructorWithNewTypeParams.fir.txt      |  4 +-
 .../ConstructorWithParentTypeParams.fir.txt   |  4 +-
 .../ConstructorWithSeveralParams.fir.txt      |  2 +-
 .../CustomProjectionKind.fir.txt              |  2 +-
 .../MethodWithFunctionTypes.fir.txt           |  2 +-
 .../MethodWithGenerics.fir.txt                |  2 +-
 .../MethodWithMappedClasses.fir.txt           |  4 +-
 .../MethodWithTypeParameters.fir.txt          |  2 +-
 .../kotlinSignature/MethodWithVararg.fir.txt  |  2 +-
 .../PropertyArrayTypes.fir.txt                |  8 ++--
 .../PropertyComplexTypes.fir.txt              |  6 +--
 .../PropertySimpleType.fir.txt                |  4 +-
 .../kotlinSignature/StarProjection.fir.txt    |  2 +-
 .../error/WrongProjectionKind.fir.txt         |  2 +-
 .../error/WrongReturnTypeStructure.fir.txt    |  2 +-
 .../WrongTypeParameterBoundStructure1.fir.txt |  2 +-
 .../WrongValueParameterStructure1.fir.txt     |  2 +-
 .../PropagateTypeArgumentNullable.fir.txt     | 24 +++++------
 .../parameter/ChangeProjectionKind1.fir.txt   |  4 +-
 .../DeeplySubstitutedClassParameter.fir.txt   |  8 ++--
 .../DeeplySubstitutedClassParameter2.fir.txt  |  8 ++--
 .../parameter/InheritNotVararg.fir.txt        |  4 +-
 .../parameter/InheritNotVarargInteger.fir.txt |  4 +-
 .../parameter/InheritNotVarargNotNull.fir.txt |  4 +-
 .../InheritNotVarargPrimitive.fir.txt         |  4 +-
 .../parameter/InheritVararg.fir.txt           |  4 +-
 .../parameter/InheritVarargInteger.fir.txt    |  4 +-
 .../parameter/InheritVarargNotNull.fir.txt    |  4 +-
 .../parameter/InheritVarargPrimitive.fir.txt  |  4 +-
 .../propagation/parameter/Kt3302.fir.txt      |  8 ++--
 .../parameter/MutableToReadOnly.fir.txt       |  4 +-
 .../parameter/NullableToNotNull.fir.txt       |  2 +-
 .../NullableToNotNullKotlinSignature.fir.txt  |  4 +-
 .../OverrideWithErasedParameter.fir.txt       |  6 +--
 .../parameter/ReadOnlyToMutable.fir.txt       |  4 +-
 .../SubclassFromGenericAndNot.fir.txt         |  4 +-
 .../SubstitutedClassParameter.fir.txt         |  6 +--
 .../SubstitutedClassParameters.fir.txt        |  8 ++--
 .../return/AddNotNullJavaSubtype.fir.txt      |  2 +-
 .../return/AddNotNullSameJavaType.fir.txt     |  2 +-
 .../AddNullabilitySameGenericType1.fir.txt    |  4 +-
 .../AddNullabilitySameGenericType2.fir.txt    |  4 +-
 .../CantMakeImmutableInSubclass.fir.txt       |  4 +-
 .../DeeplySubstitutedClassParameter.fir.txt   |  8 ++--
 .../DeeplySubstitutedClassParameter2.fir.txt  |  8 ++--
 .../HalfSubstitutedTypeParameters.fir.txt     |  6 +--
 ...itNullabilityGenericSubclassSimple.fir.txt |  4 +-
 .../InheritNullabilitySameGenericType.fir.txt |  4 +-
 .../return/InheritProjectionKind.fir.txt      |  4 +-
 .../InheritReadOnlinessOfArgument.fir.txt     |  4 +-
 .../InheritReadOnlinessSameClass.fir.txt      |  4 +-
 .../InheritReadOnlinessSubclass.fir.txt       |  4 +-
 .../return/SameProjectionKind.fir.txt         |  4 +-
 .../return/SubclassFromGenericAndNot.fir.txt  |  8 ++--
 .../return/SubclassOfCollection.fir.txt       |  2 +-
 .../return/SubclassOfMapEntry.fir.txt         |  2 +-
 .../return/SubstitutedClassParameter.fir.txt  |  6 +--
 .../return/SubstitutedClassParameters.fir.txt |  8 ++--
 ...rclassesConflictingProjectionKinds.fir.txt |  6 +--
 ...variantAndCovariantInferMutability.fir.txt |  6 +--
 ...ariantAndCovariantInferNullability.fir.txt |  6 +--
 .../TwoSuperclassesMutableAndNot.fir.txt      |  6 +--
 .../TwoSuperclassesReturnJavaSubtype.fir.txt  |  2 +-
 .../TwoSuperclassesReturnSameJavaType.fir.txt |  2 +-
 .../TwoSuperclassesSupplementNotNull.fir.txt  |  6 +--
 .../return/TypeParamOfClass.fir.txt           |  4 +-
 .../TypeParamOfClassSubstituted.fir.txt       |  4 +-
 .../propagation/return/TypeParamOfFun.fir.txt |  4 +-
 .../typeParameter/InheritNullability.fir.txt  |  4 +-
 .../typeParameter/TwoBounds.fir.txt           |  4 +-
 .../typeParameter/TwoSuperclasses.fir.txt     |  6 +--
 .../typeParameter/TwoTypeParameters.fir.txt   |  4 +-
 .../UseParameterAsUpperBound.fir.txt          |  6 +--
 .../UseParameterInUpperBound.fir.txt          |  4 +-
 ...terInUpperBoundWithKotlinSignature.fir.txt |  4 +-
 .../compiledJava/library/LoadIterable.fir.txt |  2 +-
 .../compiledJava/library/LoadIterator.fir.txt |  2 +-
 .../loadJava/compiledJava/library/Max.fir.txt |  2 +-
 .../modality/ModalityOfFakeOverrides.fir.txt  |  2 +-
 .../mutability/LoadIterable.fir.txt           |  2 +-
 .../LoadIterableWithConflict.fir.txt          |  2 +-
 .../LoadIterableWithNullability.fir.txt       |  2 +-
 .../LoadIterableWithPropagation.fir.txt       |  6 +--
 .../ReadOnlyExtendsWildcard.fir.txt           |  2 +-
 .../notNull/NotNullObjectArray.fir.txt        |  2 +-
 .../compiledJava/rendering/Rendering.fir.txt  | 40 +++++++++---------
 .../compiledJava/sam/Comparator.fir.txt       |  2 +-
 .../sam/DifferentParametersCount.fir.txt      |  6 +--
 .../sam/FakeStaticOverrides.fir.txt           |  6 +--
 .../compiledJava/sam/FilenameFilter.fir.txt   |  2 +-
 ...nericInterfaceParametersWithBounds.fir.txt |  2 +-
 .../sam/GenericMethodParameters.fir.txt       |  2 +-
 .../sam/SamSubinterfaceOfTwo.fir.txt          |  6 +--
 .../compiledJava/sam/StaticOverrides.fir.txt  |  6 +--
 .../sam/SubstitutedSamInterface.fir.txt       |  2 +-
 ...tutedSamInterfaceSubclassOfBuiltin.fir.txt |  2 +-
 .../compiledJava/sam/VarargParameter.fir.txt  |  2 +-
 .../sam/adapters/AmbiguousAdapters.fir.txt    |  4 +-
 .../compiledJava/sam/adapters/Basic.fir.txt   |  4 +-
 .../sam/adapters/Constructor.fir.txt          |  2 +-
 .../ConstructorWithAnnotations.fir.txt        |  2 +-
 .../sam/adapters/DeepSamLoop.fir.txt          |  4 +-
 .../adapters/NonTrivialFunctionType.fir.txt   |  6 +--
 .../sam/adapters/PrivateSamAdapter.fir.txt    |  2 +-
 .../sam/adapters/SelfAsParameter.fir.txt      |  2 +-
 .../sam/adapters/SeveralSamParameters.fir.txt |  2 +-
 .../sam/adapters/TypeParameterOfClass.fir.txt |  4 +-
 .../adapters/TypeParameterOfMethod.fir.txt    |  6 +--
 .../TypeParameterOfOuterClass.fir.txt         |  6 +--
 .../AdapterDoesntOverrideDeclaration.fir.txt  |  6 +--
 .../InheritedAdapterAndDeclaration.fir.txt    |  4 +-
 .../InheritedAmbiguousAdapters.fir.txt        |  4 +-
 ...itedAndOverriddenAmbiguousAdapters.fir.txt |  8 ++--
 .../inheritance/InheritedOverridden.fir.txt   |  4 +-
 .../InheritedOverriddenAdapter.fir.txt        |  6 +--
 .../inheritance/InheritedSameAdapters.fir.txt |  4 +-
 ...eritedSameAdaptersWithSubstitution.fir.txt |  6 +--
 .../inheritance/InheritedSimple.fir.txt       |  2 +-
 .../OverriddenAmbiguousAdapters.fir.txt       | 10 ++---
 .../ArraysInSubtypes.fir.txt                  | 12 +++---
 .../MethodTypeParameterErased.fir.txt         |  6 +--
 .../signaturePropagation/RawSuperType.fir.txt |  6 +--
 .../RawSuperTypeWithBound.fir.txt             |  8 ++--
 .../RawSuperTypeWithRecursiveBound.fir.txt    |  2 +-
 ...thRecursiveBoundMultipleParameters.fir.txt |  8 ++--
 .../ReturnInnerSubclassOfSupersInner.fir.txt  | 12 +++---
 .../SubclassWithRawType.fir.txt               | 14 +++----
 ...perclassesInconsistentGenericTypes.fir.txt |  6 +--
 .../loadJava/compiledJava/static/Enum.fir.txt |  4 +-
 .../compiledJava/static/StaticFinal.fir.txt   |  6 +--
 .../static/StaticMembersInEnum.fir.txt        |  4 +-
 .../compiledJava/vararg/VarargInt.fir.txt     |  2 +-
 .../compiledJava/vararg/VarargString.fir.txt  |  2 +-
 265 files changed, 654 insertions(+), 638 deletions(-)

diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
index b50574db039..e6c312c05b5 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/javaPropertyNestedGetter.txt
@@ -9,8 +9,8 @@ KtSuccessCallInfo:
       signature = KtVariableLikeSignature:
         name = sub
         receiverType = null
-        returnType = ft<JavaSubClass, JavaSubClass?>
-        symbol = val sub: ft<JavaSubClass, JavaSubClass?>
+        returnType = JavaSubClass!
+        symbol = val sub: JavaSubClass!
         callableIdIfNonLocal = /JavaClass.sub
     simpleAccess = Read:
 
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt
index 81b40b3c7a5..299587c42b9 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCall/samConstructorCall.txt
@@ -6,25 +6,25 @@ KtSuccessCallInfo:
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
-        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        returnType = java.util.Comparator<kotlin.Int!>
         symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
-            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
             symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = java/util/Comparator
     typeArgumentsMapping = {
-      T -> (ft<kotlin.Int, kotlin.Int?>)
+      T -> (kotlin.Int!)
     }
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
-        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
         symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
         callableIdIfNonLocal = null)
     }
diff --git a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt
index 09c47540e1d..0e705a78179 100644
--- a/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt
+++ b/analysis/analysis-api/testData/components/callResolver/resolveCandidates/singleCandidate/samConstructorCall.txt
@@ -6,25 +6,25 @@ KtApplicableCallCandidateInfo:
       extensionReceiver = null
       signature = KtFunctionLikeSignature:
         receiverType = null
-        returnType = java.util.Comparator<ft<kotlin.Int, kotlin.Int?>>
+        returnType = java.util.Comparator<kotlin.Int!>
         symbol = java/util/Comparator(function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>): java.util.Comparator<T>
         valueParameters = [
           KtVariableLikeSignature:
             name = function
             receiverType = null
-            returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+            returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
             symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
             callableIdIfNonLocal = null
         ]
         callableIdIfNonLocal = java/util/Comparator
     typeArgumentsMapping = {
-      T -> (ft<kotlin.Int, kotlin.Int?>)
+      T -> (kotlin.Int!)
     }
     argumentMapping = {
       {x: Int, y: Int -> 1} -> (KtVariableLikeSignature:
         name = function
         receiverType = null
-        returnType = kotlin.Function2<ft<kotlin.Int, kotlin.Int?>, ft<kotlin.Int, kotlin.Int?>, kotlin.Int>
+        returnType = kotlin.Function2<kotlin.Int!, kotlin.Int!, kotlin.Int>
         symbol = function: kotlin.Function2<ft<T & Any, T?>, ft<T & Any, T?>, kotlin.Int>
         callableIdIfNonLocal = null)
     }
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt
index e32f50453f0..1c845125d07 100644
--- a/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt
+++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/samAsConstructorArgument.txt
@@ -1,2 +1,2 @@
 expression: { println("hello1") }
-expected type: ft<java/lang/Runnable, java/lang/Runnable?>
+expected type: java/lang/Runnable!
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt
index 0f7e949b2aa..a377ff851b9 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/enumEntry.txt
@@ -251,7 +251,7 @@ KtFunctionSymbol:
   name: getDeclaringClass
   origin: SUBSTITUTION_OVERRIDE
   receiverType: null
-  returnType: ft<java/lang/Class<ft<test/E, test/E?>>, java/lang/Class<ft<test/E, test/E?>>?>
+  returnType: ft<java/lang/Class<test/E!>, java/lang/Class<test/E!>?>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
index adfbb2d1aed..27c1e98719b 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
@@ -8,7 +8,7 @@ KtJavaFieldSymbol:
   name: value
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
+  returnType: kotlin/CharArray!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   visibility: Private
@@ -362,7 +362,7 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
+  returnType: kotlin/ByteArray!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -390,7 +390,7 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
+  returnType: kotlin/ByteArray!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -418,7 +418,7 @@ KtFunctionSymbol:
   name: getBytes
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/ByteArray, kotlin/ByteArray?>
+  returnType: kotlin/ByteArray!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1072,7 +1072,7 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1100,7 +1100,7 @@ KtFunctionSymbol:
   name: substring
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1158,7 +1158,7 @@ KtFunctionSymbol:
   name: concat
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1186,7 +1186,7 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1215,7 +1215,7 @@ KtFunctionSymbol:
   name: replace
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1300,7 +1300,7 @@ KtFunctionSymbol:
   name: replaceFirst
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1329,7 +1329,7 @@ KtFunctionSymbol:
   name: replaceAll
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1358,7 +1358,7 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
+  returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1387,7 +1387,7 @@ KtFunctionSymbol:
   name: split
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>
+  returnType: ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1415,7 +1415,7 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1443,7 +1443,7 @@ KtFunctionSymbol:
   name: toLowerCase
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1469,7 +1469,7 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: [
@@ -1497,7 +1497,7 @@ KtFunctionSymbol:
   name: toUpperCase
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1523,7 +1523,7 @@ KtFunctionSymbol:
   name: trim
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1575,7 +1575,7 @@ KtFunctionSymbol:
   name: toCharArray
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/CharArray, kotlin/CharArray?>
+  returnType: kotlin/CharArray!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1601,7 +1601,7 @@ KtFunctionSymbol:
   name: intern
   origin: JAVA
   receiverType: null
-  returnType: ft<kotlin/String, kotlin/String?>
+  returnType: kotlin/String!
   symbolKind: CLASS_MEMBER
   typeParameters: []
   valueParameters: []
@@ -1653,7 +1653,7 @@ KtNamedClassOrObjectSymbol:
   origin: JAVA
   superTypes: [
     kotlin/Any
-    java/util/Comparator<ft<kotlin/String, kotlin/String?>>
+    java/util/Comparator<kotlin/String!>
     java/io/Serializable
   ]
   symbolKind: CLASS_MEMBER
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt
index c4208ffec99..1ca85c0cb47 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/classFromJdk.txt
@@ -14,7 +14,7 @@ KtNamedClassOrObjectSymbol:
   superTypes: [
     kotlin/Any
     java/io/Serializable
-    kotlin/Comparable<ft<kotlin/String, kotlin/String?>>
+    kotlin/Comparable<kotlin/String!>
     kotlin/CharSequence
   ]
   symbolKind: TOP_LEVEL
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
index 14cd6f1aeaf..6b9b6d9e0bc 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/NonNullNever.fir.txt
@@ -5,7 +5,7 @@
 public open class NonNullNever : R|kotlin/Any| {
     @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?|
 
-    @R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+    @R|MyNullable|() public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String?|, @R|MyNullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
     public constructor(): R|NonNullNever|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
index c0a68745acf..e8c1f6694e6 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/Strange.fir.txt
@@ -1,5 +1,5 @@
 public open class Strange : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>|
+    @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.MAYBE|()) public open fun foo(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.ALWAYS|()) x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
index 17e9afadb38..89499884110 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
@@ -1,9 +1,9 @@
 @R|FieldsAreNullable|() public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|
+    public open field field: R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open field nonNullField: R|@EnhancedNullability kotlin/String|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
index d7d402af06e..06c001e26e1 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
@@ -1,7 +1,7 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
-    @R|spr/ForceFlexibility|() public open fun bar(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|
+    @R|spr/ForceFlexibility|() public open fun bar(x: R|kotlin/String!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|kotlin/String!|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
index 71f2d826974..4aa7617d316 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
@@ -5,7 +5,7 @@
 
     public open fun baz(@R|spr/UnknownNullability|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
-    public open fun foobar(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun foobar(@R|javax/annotation/Nonnull|(when = R|javax/annotation/meta/When.UNKNOWN|()) x: R|kotlin/String!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
index 9efca94a605..35f3b2b8dd7 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
@@ -1,55 +1,55 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
-    public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
 
-    public open fun foo2(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo2(x: R|kotlin/String!|): R|kotlin/String!|
 
-    public open fun foo3(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo3(x: R|kotlin/String!|): R|kotlin/String!|
 
     @R|javax/annotation/Nullable|() public open fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
     @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
-    public open fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
 
     public constructor(): R|A|
 
 }
 @R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| {
-    public abstract fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+    public abstract fun foo1(x: R|kotlin/String!|): R|kotlin/CharSequence!|
 
-    public abstract fun foo2(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+    public abstract fun foo2(x: R|kotlin/String!|): R|kotlin/CharSequence!|
 
-    public abstract fun foo3(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+    public abstract fun foo3(x: R|kotlin/String!|): R|kotlin/CharSequence!|
 
     @R|javax/annotation/Nullable|() public abstract fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
     @R|javax/annotation/Nullable|() public abstract fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
-    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+    public abstract fun baz(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/CharSequence!|
 
 }
 @R|NullableApi|() public open class B : R|A|, R|AInt| {
-    public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|@EnhancedNullability kotlin/String|
 
     public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
-    public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
 
     public constructor(): R|B|
 
 }
 @R|NonNullApi|() public open class C : R|A|, R|AInt| {
-    public open fun foo1(x: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo1(x: R|kotlin/String!|): R|kotlin/String!|
 
-    public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo2(@R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
 
     public open fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
     @R|javax/annotation/Nullable|() public open fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
-    public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun baz(x: R|@EnhancedNullability kotlin/String|): R|kotlin/String!|
 
     public constructor(): R|C|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index ab7e31d0786..b0ca1334a97 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -1,40 +1,40 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|
+    public open field field: R|kotlin/String!|
 
-    public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
-    @R|NullableApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|NonNullApi|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+    @R|NullableApi|() public open fun foobar(x: R|kotlin/String!|, @R|NonNullApi|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
-    public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun bar(): R|kotlin/String!|
 
-    @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+    @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
 
     public constructor(): R|A|
 
     @R|NullableApi|() public open inner class B : R|kotlin/Any| {
-        public open field field: R|ft<kotlin/String, kotlin/String?>|
+        public open field field: R|kotlin/String!|
 
-        public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|
+        public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|kotlin/String!|
 
-        @R|NonNullApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|NullableApi|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+        @R|NonNullApi|() public open fun foobar(x: R|kotlin/String!|, @R|NullableApi|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
-        public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+        public open fun bar(): R|kotlin/String!|
 
-        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
 
         public A.constructor(): R|A.B|
 
     }
     @R|FieldsAreNullable|() public open inner class C : R|kotlin/Any| {
-        public open field field: R|ft<kotlin/String, kotlin/String?>|
+        public open field field: R|kotlin/String!|
 
-        public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+        public open fun foo(x: R|kotlin/String!|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
-        @R|NullableApi|() public open fun foobar(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+        @R|NullableApi|() public open fun foobar(x: R|kotlin/String!|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
-        public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+        public open fun bar(): R|kotlin/String!|
 
-        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>?, kotlin/collections/List<kotlin/String!>?>|
 
         public A.constructor(): R|A.C|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
index 96f49fe9531..cf9c73e7660 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
@@ -1,7 +1,7 @@
 @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
index eb7b2b5c972..cbc09931bdc 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
@@ -11,7 +11,7 @@ public open class A : R|kotlin/Any| {
 public open class A2 : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open fun foo(q: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(q: R|kotlin/String!|, @R|javax/annotation/Nonnull|() x: R|@EnhancedNullability kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String!|
 
     @R|javax/annotation/Nonnull|() public open fun bar(): R|@EnhancedNullability kotlin/String|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
index 590e2ac7e29..24c586627b6 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
@@ -1,11 +1,11 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|
+    public open field field: R|kotlin/String!|
 
-    public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
-    public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun bar(): R|kotlin/String!|
 
-    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
index 314e8c2f2ea..13f5d5d91ee 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
@@ -1,11 +1,11 @@
 public open class A : R|kotlin/Any| {
-    public open field field: R|ft<kotlin/String, kotlin/String?>|
+    public open field field: R|kotlin/String!|
 
-    public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|spr/Nullable|() y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(x: R|kotlin/String!|, @R|spr/Nullable|() y: R|kotlin/CharSequence!|): R|kotlin/String!|
 
-    public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun bar(): R|kotlin/String!|
 
-    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+    @R|spr/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     public constructor(): R|test/A|
 
diff --git a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
index 0d6eebb5231..c432a346747 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/mapping/AbstractMap.fir.txt
@@ -1,4 +1,4 @@
-public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>| {
+public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<kotlin/String!, kotlin/String!>| {
     public constructor(): R|AbstractMap|
 
 }
diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt
index 9e9c34facd3..9a73287ac08 100644
--- a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt
+++ b/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt
@@ -1,5 +1,6 @@
-public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|
+public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|
 
-public final fun list(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+public final fun list(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
+
+public final fun printStream(): R|java/io/PrintStream!|
 
-public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream?>|
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
index 8be77c6f817..4bf790068f5 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun test(list: R|kotlin/collections/List<kotlin/String>|, string: R|kotlin/String|): R|kotlin/Unit| {
-        R|/Matchers.assertThat|<R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>|>(R|<local>/list|, R|/Matchers.hasItem|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/string|))
+        R|/Matchers.assertThat|<R|ft<kotlin/collections/List<kotlin/String>, kotlin/collections/List<kotlin/String>?>|>(R|<local>/list|, R|/Matchers.hasItem|<R|kotlin/String!|>(R|<local>/string|))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
index c796ab139b0..be2beba6196 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
@@ -7,7 +7,7 @@ FILE: main.kt
     public abstract interface PsiClass : R|kotlin/Any| {
     }
     public final fun test(): R|kotlin/Unit| {
-        lval processor: R|AdapterProcessor<PsiMethod, PsiClass>| = R|/AdapterProcessor.AdapterProcessor|<R|PsiMethod|, R|PsiClass|>(R|/Function|<R|ft<PsiMethod, PsiMethod?>|, R|ft<PsiClass, PsiClass?>|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|ft<PsiClass, PsiClass?>| <inline=NoInline>  {
+        lval processor: R|AdapterProcessor<PsiMethod, PsiClass>| = R|/AdapterProcessor.AdapterProcessor|<R|PsiMethod|, R|PsiClass|>(R|/Function|<R|PsiMethod!|, R|PsiClass!|>(<L> = Function@fun <anonymous>(method: R|PsiMethod?|): R|PsiClass!| <inline=NoInline>  {
             ^ R|<local>/method|?.{ $subj$.R|/PsiMethod.containingClass| }
         }
         ))
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt
index 984850a63b4..54feacf219b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness/positive/exhaustiveWhenAndFlexibleType.fir.txt
@@ -15,7 +15,7 @@ FILE: main.kt
 
     }
     public final fun test_1(): R|kotlin/Unit| {
-        lval e: R|ft<E, E?>| = Q|Utils|.R|/Utils.getEnum|()
+        lval e: R|E!| = Q|Utils|.R|/Utils.getEnum|()
         lval s: R|kotlin/String| = when (R|<local>/e|) {
             ==($subj$, Null(null)) ->  {
                 ^test_1 Unit
@@ -34,7 +34,7 @@ FILE: main.kt
         R|<local>/s|.R|kotlin/String.length|
     }
     public final fun test_2(): R|kotlin/Unit| {
-        lval e: R|ft<E, E?>| = Q|Utils|.R|/Utils.getEnum|()
+        lval e: R|E!| = Q|Utils|.R|/Utils.getEnum|()
         lval s: R|kotlin/String| = when (R|<local>/e|) {
             ==($subj$, Q|E|.R|/E.A|) ->  {
                 String()
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
index 239fbdd00a4..2356f2c98de 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
@@ -16,7 +16,7 @@ FILE: test.kt
     private final val DERIVED_FACTORY: R|DiagnosticFactory0<DerivedElement>| = R|/DiagnosticFactory0.DiagnosticFactory0|<R|DerivedElement|>()
         private get(): R|DiagnosticFactory0<DerivedElement>|
     public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| {
-        lval casted: R|Diagnostic<ft<DerivedElement, DerivedElement?>>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|@EnhancedNullability Diagnostic<ft<DerivedElement, DerivedElement?>>|>|(R|<local>/d|)
+        lval casted: R|Diagnostic<DerivedElement!>| = R|/DERIVED_FACTORY|.R|SubstitutionOverride</DiagnosticFactory0.cast: R|@EnhancedNullability Diagnostic<DerivedElement!>|>|(R|<local>/d|)
         lval element: R|DerivedElement| = R|<local>/casted|.R|/Diagnostic.element|
         R|/Fix.Fix|(R|<local>/element|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
index 53ce584047d..4a4b7e824a4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
@@ -1,5 +1,5 @@
 FILE: test.kt
     public final fun test(): R|kotlin/Unit| {
-        lval staticReference: R|kotlin/reflect/KMutableProperty0<ft<kotlin/String, kotlin/String?>>| = Q|JavaClass|::R|/JavaClass.staticField|
-        lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, ft<kotlin/String, kotlin/String?>>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
+        lval staticReference: R|kotlin/reflect/KMutableProperty0<kotlin/String!>| = Q|JavaClass|::R|/JavaClass.staticField|
+        lval nonStaticReference: R|kotlin/reflect/KMutableProperty1<JavaClass, kotlin/String!>| = Q|JavaClass|::R|/JavaClass.nonStaticField|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
index ca2b4c1c0f8..c2a7ce3a2e6 100644
--- a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
@@ -37,7 +37,7 @@ FILE: O.kt
                         }
 
                         public final fun local(): R|kotlin/Unit| {
-                            lval y: R|ft<kotlin/String, kotlin/String?>| = this@R|/O.Derived|.R|/Base.foo|()
+                            lval y: R|kotlin/String!| = this@R|/O.Derived|.R|/Base.foo|()
                         }
 
                         public final val oo: R|<anonymous>| = object : R|kotlin/Any| {
@@ -66,7 +66,7 @@ FILE: O.kt
                     }
 
                     public final fun local(): R|kotlin/Unit| {
-                        lval y: R|ft<kotlin/String, kotlin/String?>| = this@R|/O.Derived|.R|/Base.foo|()
+                        lval y: R|kotlin/String!| = this@R|/O.Derived|.R|/Base.foo|()
                     }
 
                 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
index f4b1bd6160a..c49d90caabd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
@@ -1,6 +1,6 @@
 FILE: flexibleTypeBug.kt
     public final fun foo(): R|kotlin/Unit| {
-        lvar list1: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|kotlin/String|>()
+        lvar list1: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>| = Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|kotlin/String|>()
         lval list2: R|kotlin/collections/List<kotlin/String>| = R|kotlin/collections/listOf|<R|kotlin/String|>(String(b))
-        R|<local>/list1| = R|<local>/list1|.R|kotlin/collections/plus|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/list2|)
+        R|<local>/list1| = R|<local>/list1|.R|kotlin/collections/plus|<R|kotlin/String!|>(R|<local>/list2|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/dnnThrowJavaCall.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/dnnThrowJavaCall.fir.txt
index d9c34cb46b6..7b4eb930552 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/dnnThrowJavaCall.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/dnnThrowJavaCall.fir.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun getExcludedDirs(project: R|Project|, excludedProjects: R|kotlin/collections/List<Project>|): R|kotlin/collections/List<java/io/File>| {
-        ^getExcludedDirs R|<local>/project|.R|/Project.plugins|.R|/PluginContainer.findPlugin|<R|ft<IdeaPlugin, IdeaPlugin?>|>(<getClass>(Q|IdeaPlugin|).R|kotlin/jvm/java|<R|IdeaPlugin|>)?.{ $subj$.R|/IdeaPlugin.excludeDirs| }?.{ $subj$.R|kotlin/collections/toList|<R|ft<java/io/File, java/io/File?>|>() } ?: R|kotlin/collections/emptyList|<R|java/io/File|>()
+        ^getExcludedDirs R|<local>/project|.R|/Project.plugins|.R|/PluginContainer.findPlugin|<R|IdeaPlugin!|>(<getClass>(Q|IdeaPlugin|).R|kotlin/jvm/java|<R|IdeaPlugin|>)?.{ $subj$.R|/IdeaPlugin.excludeDirs| }?.{ $subj$.R|kotlin/collections/toList|<R|java/io/File!|>() } ?: R|kotlin/collections/emptyList|<R|java/io/File|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt b/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
index 303015e0723..d4407db5039 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
@@ -7,5 +7,5 @@ FILE: main.kt
     }
     public final fun main(): R|kotlin/Unit| {
         R|/K.K|<R|kotlin/Int|>(Int(0))
-        R|/JavaClass.JavaClass|<R|ft<kotlin/Int, kotlin/Int?>|>(Int(0))
+        R|/JavaClass.JavaClass|<R|kotlin/Int!|>(Int(0))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
index 6c2668cf6f1..954ab4a01b0 100644
--- a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun test(a: R|A|): R|kotlin/Unit| {
         lval int: R|kotlin/Int| = R|<local>/a|.R|/A.x|
-        lval string: R|ft<kotlin/String, kotlin/String?>| = R|<local>/a|.R|/A.getX|()
+        lval string: R|kotlin/String!| = R|<local>/a|.R|/A.getX|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
index 8f3b3c8fab3..1da8a367768 100644
--- a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        lval b: R|ft<B, B?>| = Q|B|.R|/B.VALUE|
+        lval b: R|B!| = Q|B|.R|/B.VALUE|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
index 3ab56124c9c..582e3321e9b 100644
--- a/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
@@ -24,7 +24,7 @@ FILE: main.kt
 
     }
     public final fun callJava(derived: R|Test.Derived|, derivedRaw: R|Test.DerivedRaw|, v: R|Test.I123|): R|kotlin/Unit| {
-        R|<local>/derived|.R|/Test.Derived.foo|<R|ft<Test.I123, Test.I123?>|>(R|<local>/v|)
+        R|<local>/derived|.R|/Test.Derived.foo|<R|Test.I123!|>(R|<local>/v|)
         R|<local>/derivedRaw|.R|/Test.DerivedRaw.foo|(R|<local>/v|)
     }
     public final fun callKotlin(derived: R|KDerived|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
index 921aec46e99..a9922199723 100644
--- a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        R|/JavaClass.JavaClass|<R|kotlin/String|>(Null(null)).R|SubstitutionOverride</JavaClass.foo: R|ft<kotlin/String, kotlin/String?>|>|().R|kotlin/String.length|
+        R|/JavaClass.JavaClass|<R|kotlin/String|>(Null(null)).R|SubstitutionOverride</JavaClass.foo: R|kotlin/String!|>|().R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
index 46d0dff10c6..7a2a68b7ebd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
@@ -1,10 +1,10 @@
 FILE: main.kt
     public final fun test_1(x: R|A|): R|kotlin/Unit| {
-        lval str1: R|ft<kotlin/String, kotlin/String?>| = R|<local>/x|.R|/A.vmParameters|
+        lval str1: R|kotlin/String!| = R|<local>/x|.R|/A.vmParameters|
         lval str2: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
     }
     public final fun test_2(x: R|B|): R|kotlin/Unit| {
-        lval int: R|ft<kotlin/Int, kotlin/Int?>| = R|<local>/x|.R|/B.vmParameters|
+        lval int: R|kotlin/Int!| = R|<local>/x|.R|/B.vmParameters|
         lval error: <ERROR TYPE REF: Unresolved name: vMParameters> = R|<local>/x|.<Unresolved name: vMParameters>#
     }
     public final fun test_3(x: R|C|): R|kotlin/Unit| {
diff --git a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
index f9c5a8d2338..20bcc2143d3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
@@ -1,6 +1,6 @@
 FILE: main.kt
     public final fun foo(): R|kotlin/Unit| {
-        Q|RawType|.R|/RawType.bar|(<L> = bar@fun <anonymous>(it: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|kotlin/Boolean| <inline=NoInline>  {
+        Q|RawType|.R|/RawType.bar|(<L> = bar@fun <anonymous>(it: R|kotlin/CharSequence!|): R|kotlin/Boolean| <inline=NoInline>  {
             ^ CMP(>, R|<local>/it|.R|kotlin/CharSequence.length|.R|kotlin/Int.compareTo|(Int(0)))
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
index 14f4f447ac7..8836513bbe9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
@@ -1,10 +1,10 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
         }
         )
-        R|/MyFunction|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/MyFunction|<R|kotlin/Int!|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.toString|()
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
index 7b879e4b71c..704256949e8 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
@@ -6,23 +6,23 @@ FILE: main.kt
     public final fun <X, Y> foo3(f: R|MyFunction<X, Y>|, x: R|X|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        R|/foo1|(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/foo1|(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
         }
         ))
-        R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Number, kotlin/Number?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/foo2|(R|/MyFunction|<R|kotlin/Number|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.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|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        <Inapplicable(INAPPLICABLE): /foo2>#(R|/MyFunction|<R|kotlin/Int!|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.toString|()
         }
         ))
-        R|/foo3|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/foo3|<R|kotlin/Int|, R|kotlin/String!|>(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toString|()
         }
         ), Int(1))
-        R|/foo3|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(R|/MyFunction|<R|kotlin/Int|, R|ft<kotlin/String, kotlin/String?>|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        R|/foo3|<R|kotlin/Int|, R|kotlin/String!|>(R|/MyFunction|<R|kotlin/Int|, R|kotlin/String!|>(<L> = MyFunction@fun <anonymous>(x: R|kotlin/Number|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
         }
         ), Int(2))
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
index c28e19864b9..14d02f74c70 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
@@ -1,22 +1,22 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo1|(<L> = foo1@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.toInt|().R|kotlin/Int.toString|()
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|ft<kotlin/Number, kotlin/Number?>|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo2|(<L> = foo2@fun <anonymous>(x: R|kotlin/Number!|): R|kotlin/CharSequence!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
         }
         )
-        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/CharSequence, kotlin/CharSequence?>| <inline=Unknown>  {
+        Q|JavaUsage|.<Inapplicable(INAPPLICABLE): /JavaUsage.foo2>#(<L> = foo2@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/CharSequence!| <inline=Unknown>  {
             ^ R|<local>/x|.R|kotlin/Int.toString|()
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(foo3@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo3|<R|kotlin/Int!|, R|kotlin/String!|>(foo3@fun <anonymous>(x: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Int.plus|(Int(1)).R|kotlin/Int.toString|()
         }
         , Int(1))
-        Q|JavaUsage|.R|/JavaUsage.foo3|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(foo3@fun <anonymous>(x: R|kotlin/Number|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo3|<R|kotlin/Int!|, R|kotlin/String!|>(foo3@fun <anonymous>(x: R|kotlin/Number|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/Number.toInt|().R|kotlin/Int.toString|()
         }
         , Int(2))
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt
index fdb8b14c28e..adc2ff17d6d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.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|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo|(<L> = foo@fun <anonymous>(x: R|kotlin/Int|): R|kotlin/Boolean!| <inline=NoInline>  {
             ^ CMP(>, R|<local>/x|.R|kotlin/Int.compareTo|(Int(1)))
         }
         )
-        Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|ft<kotlin/Boolean, kotlin/Boolean?>| <inline=NoInline>  {
+        Q|JavaUsage|.R|/JavaUsage.foo|(foo@fun <anonymous>(it: R|kotlin/Int|): R|kotlin/Boolean!| <inline=NoInline>  {
             ^ CMP(>, R|<local>/it|.R|kotlin/Int.compareTo|(Int(1)))
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
index 1469cbc824a..747ea437a50 100644
--- a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
@@ -5,7 +5,7 @@ FILE: main.kt
 
     }
     public final fun main(): R|kotlin/Unit| {
-        Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|ft<TypeConstructor, TypeConstructor?>|, c2: R|ft<TypeConstructor, TypeConstructor?>|): R|kotlin/Boolean| <inline=NoInline>  {
+        Q|OverridingUtil|.R|/OverridingUtil.createWithEqualityAxioms|(<L> = l1@fun <anonymous>(c1: R|TypeConstructor!|, c2: R|TypeConstructor!|): R|kotlin/Boolean| <inline=NoInline>  {
             when () {
                 ==(R|<local>/c1|.R|/TypeConstructor.x|, R|<local>/c2|.R|/TypeConstructor.x|) ->  {
                     ^@l1 Boolean(true)
diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt b/compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt
index 1e9e288f2b6..d711222e927 100644
--- a/compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/scopes/explicitOverrideOfTwoMembers_java.overrides.txt
@@ -11,11 +11,11 @@ D:
   [Synthetic]: public abstract val y: R|kotlin/Int| from Java enhancement scope for /D [id: 0]
     [Source]: public abstract val y: R|kotlin/Int| from Use site scope of /A [id: 1]
     [Source]: public abstract val y: R|kotlin/Int| from Use site scope of /B [id: 2]
-  [Enhancement]: public abstract fun getX(): R|ft<kotlin/Any, kotlin/Any?>| from Java enhancement scope for /D [id: 0]
+  [Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /D [id: 0]
 
 E:
   [IntersectionOverride]: public abstract val x: R|kotlin/Int| from Java enhancement scope for /E [id: 0]
     [Source]: public abstract val x: R|kotlin/Int| from Use site scope of /A [id: 1]
     [Source]: public abstract val x: R|kotlin/String| from Use site scope of /B [id: 2]
-  [Enhancement]: public abstract fun getX(): R|ft<kotlin/Any, kotlin/Any?>| from Java enhancement scope for /E [id: 0]
+  [Enhancement]: public abstract fun getX(): R|kotlin/Any!| from Java enhancement scope for /E [id: 0]
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/getterOverrideAndKotlinProperty.overrides.txt b/compiler/fir/analysis-tests/testData/resolve/scopes/getterOverrideAndKotlinProperty.overrides.txt
index 43927830d4a..0c786a4cb57 100644
--- a/compiler/fir/analysis-tests/testData/resolve/scopes/getterOverrideAndKotlinProperty.overrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/scopes/getterOverrideAndKotlinProperty.overrides.txt
@@ -1,15 +1,15 @@
 A:
-  [Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 0]
+  [Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 0]
 
 B:
   [Source]: public open override fun getFoo(): R|kotlin/String| from Use site scope of /B [id: 0]
-    [Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
+    [Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
 
 C:
   [Source]: public open override fun getFoo(): R|kotlin/String| from Java enhancement scope for /C [id: 0]
-    [Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
+    [Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
 
 D:
   [Source]: public open override fun getFoo(): R|kotlin/String| from Use site scope of /D [id: 0]
-    [Enhancement]: public abstract fun getFoo(): R|ft<kotlin/String, kotlin/String?>| from Java enhancement scope for /A [id: 1]
+    [Enhancement]: public abstract fun getFoo(): R|kotlin/String!| from Java enhancement scope for /A [id: 1]
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt b/compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt
index 2f26aa7aba5..97dd656c1ce 100644
--- a/compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt
@@ -1,14 +1,14 @@
 C:
   [Source]: public open override fun getName(): R|kotlin/String| from Use site scope of /C [id: 0]
-    [Enhancement]: public abstract fun getName(): R|ft<kotlin/String, kotlin/String?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
+    [Enhancement]: public abstract fun getName(): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
   [Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Use site scope of /C [id: 0]
-    [SubstitutionOverride]: public abstract fun setName(newName: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/Any, kotlin/Any?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
-      [Enhancement]: public abstract fun setName(newName: R|ft<kotlin/String, kotlin/String?>|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
+    [SubstitutionOverride]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
+      [Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
   [Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
 
 D:
   [Source]: public open override fun getName(): R|kotlin/String| from Java enhancement scope for /D [id: 0]
-    [Enhancement]: public abstract fun getName(): R|ft<kotlin/String, kotlin/String?>| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
+    [Enhancement]: public abstract fun getName(): R|kotlin/String!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
   [Source]: private final var name: R|kotlin/String| = R|<local>/name| from Java enhancement scope for /D [id: 0]
     [Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt b/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt
index df658331453..d3312d48587 100644
--- a/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/scopes/specialFunctionInJava_2.overrides.txt
@@ -4,19 +4,19 @@ SomeMap:
       [SubstitutionOverride]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
         [Library]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
       [Library]: public abstract fun containsKey(key: R|K|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
-    [SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
-      [Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
-        [SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
-          [Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
-      [SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
-        [Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
+    [SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
+      [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
+        [SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
+          [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
+      [SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 6]
+        [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 7]
   [IntersectionOverride]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Java enhancement scope for /SomeMap [id: 0]
     [SubstitutionOverride]: public abstract fun containsValue(value: R|ft<V3 & Any, V3?>|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
       [SubstitutionOverride]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 2]
         [Library]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
       [Library]: public abstract fun containsValue(value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Map [id: 3]
-    [SubstitutionOverride]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
-      [Enhancement]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
+    [SubstitutionOverride]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyMap] for type SomeMap<K3, V3> [id: 4]
+      [Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 5]
   [IntersectionOverride]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Java enhancement scope for /SomeMap [id: 0]
     [SubstitutionOverride]: public abstract operator fun get(key: R|ft<K3 & Any, K3?>|): R|V3?| from Substitution scope for [Use site scope of kotlin/collections/MutableMap] for type SomeMap<K3, V3> [id: 1]
       [SubstitutionOverride]: public abstract operator fun get(key: R|K|): R|V?| from Use site scope of kotlin/collections/MutableMap [id: 2]
@@ -31,9 +31,9 @@ SomeMap:
     [Library]: public open fun remove(key: R|K|, value: R|V|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableMap [id: 1]
 
 MyMap:
-  [Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
-    [SubstitutionOverride]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
-      [Enhancement]: public abstract fun containsKey(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 2]
-  [Enhancement]: public abstract fun containsValue(key: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
+  [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
+    [SubstitutionOverride]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Substitution scope for [Java enhancement scope for /MyBaseMap] for type MyMap<K2, V2> [id: 1]
+      [Enhancement]: public abstract fun containsKey(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyBaseMap [id: 2]
+  [Enhancement]: public abstract fun containsValue(key: R|kotlin/Any!|): R|kotlin/Boolean| from Java enhancement scope for /MyMap [id: 0]
   [Enhancement]: public abstract operator fun get(key: R|ft<K2 & Any, K2?>|): R|ft<V2 & Any, V2?>| from Java enhancement scope for /MyMap [id: 0]
 
diff --git a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
index 7a37c00bb72..5b9e6a8a995 100644
--- a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
@@ -16,7 +16,7 @@ FILE: Main.kt
         R|/takeStrings|(R|<local>/list|)
     }
     public final fun testFromJava(): R|kotlin/Unit| {
-        lval values: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>| = Q|Utils|.R|/Utils.getStrings|()
-        lval list: R|kotlin/collections/List<ft<kotlin/String, kotlin/String?>>| = R|/myListOf|<R|ft<kotlin/String, kotlin/String?>|>(vararg(*R|<local>/values|))
+        lval values: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>| = Q|Utils|.R|/Utils.getStrings|()
+        lval list: R|kotlin/collections/List<kotlin/String!>| = R|/myListOf|<R|kotlin/String!|>(vararg(*R|<local>/values|))
         R|/takeStrings|(R|<local>/list|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
index 2d8a79801dc..2f9edd1e2c7 100644
--- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|Keys|.R|/Keys.getData|<R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride<kotlin/Array.get: R|ft<kotlin/String, kotlin/String?>|>|(Int(0)).R|kotlin/String.length|
-        Q|Keys|.R|/Keys.getData|<R|ft<kotlin/String, kotlin/String?>|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
+        Q|Keys|.R|/Keys.getData|<R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|>(Q|Keys|.R|/Keys.X|).R|SubstitutionOverride<kotlin/Array.get: R|kotlin/String!|>|(Int(0)).R|kotlin/String.length|
+        Q|Keys|.R|/Keys.getData|<R|kotlin/String!|>(Q|Keys|.R|/Keys.Y|).R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
index 04e5bf76224..f0f60922ccf 100644
--- a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun main(x: R|kotlin/collections/MutableCollection<kotlin/collections/Set<kotlin/String>>|): R|kotlin/Unit| {
-        lval y: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|ft<kotlin/String, kotlin/String?>|>(R|<local>/x|)
-        R|<local>/y|.R|SubstitutionOverride<kotlin/collections/MutableList.get: R|ft<kotlin/String, kotlin/String?>|>|(Int(0)).R|kotlin/String.length|
+        lval y: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>| = Q|ContainerUtil|.R|/ContainerUtil.flatten|<R|kotlin/String!|>(R|<local>/x|)
+        R|<local>/y|.R|SubstitutionOverride<kotlin/collections/MutableList.get: R|kotlin/String!|>|(Int(0)).R|kotlin/String.length|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt b/compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
index 7aba21acd12..7baf60bf4d4 100644
--- a/compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
@@ -1,3 +1,3 @@
 FILE: treeSet.kt
-    public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|ft<kotlin/Int, kotlin/Int?>|>()
+    public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|kotlin/Int!|>()
         public get(): R|java/util/SortedSet<kotlin/Int>|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt
index 2a18d2d4c33..1eecd57c5e4 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/referenceToJavaStdlib.fir.txt
@@ -1,6 +1,6 @@
 FILE: referenceToJavaStdlib.kt
     public final fun detectDirsWithTestsMapFileOnly(file: R|java/io/File|): R|kotlin/collections/List<kotlin/String>| {
-        Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|<local>/file|.R|java/io/File.toPath|()).R|SubstitutionOverride<java/util/stream/Stream.filter: R|ft<java/util/stream/Stream<ft<java/nio/file/Path, java/nio/file/Path?>>, java/util/stream/Stream<ft<java/nio/file/Path, java/nio/file/Path?>>?>|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|)
+        Q|java/nio/file/Files|.R|java/nio/file/Files.walk|(R|<local>/file|.R|java/io/File.toPath|()).R|SubstitutionOverride<java/util/stream/Stream.filter: R|ft<java/util/stream/Stream<java/nio/file/Path!>, java/util/stream/Stream<java/nio/file/Path!>?>|>|(Q|java/nio/file/Files|::R|java/nio/file/Files.isRegularFile|)
     }
     public abstract interface A : R|kotlin/Any| {
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
index c2edebe437d..0aac7caa909 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
@@ -1,3 +1,3 @@
 FILE: main.kt
-    public final val enumMap: R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>, ft<kotlin/String, kotlin/String?>>| = R|java/util/EnumMap.EnumMap|<R|ft<JavaEnum, JavaEnum?>|, R|ft<kotlin/String, kotlin/String?>|>(R|kotlin/collections/mapOf|<R|ft<JavaEnum, JavaEnum?>|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|@EnhancedNullability JavaEnum|, R|kotlin/String|>(String(A))))
-        public get(): R|java/util/EnumMap<ft<JavaEnum, JavaEnum?>, ft<kotlin/String, kotlin/String?>>|
+    public final val enumMap: R|java/util/EnumMap<JavaEnum!, kotlin/String!>| = R|java/util/EnumMap.EnumMap|<R|JavaEnum!|, R|kotlin/String!|>(R|kotlin/collections/mapOf|<R|JavaEnum!|, R|kotlin/String|>(Q|JavaEnum|.R|/JavaEnum.A|.R|kotlin/to|<R|@EnhancedNullability JavaEnum|, R|kotlin/String|>(String(A))))
+        public get(): R|java/util/EnumMap<JavaEnum!, kotlin/String!>|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt
index 3b7072d2ca3..e0b6da48b91 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/FieldVsSyntheticAccessor.fir.txt
@@ -7,15 +7,15 @@ FILE: User.kt
         }
 
         public final fun foo(tree: R|BaseClass|): R|kotlin/Unit| {
-            lval ui: R|ft<kotlin/String, kotlin/String?>| = R|<local>/tree|.<HIDDEN: /BaseClass.ui is invisible>#
+            lval ui: R|kotlin/String!| = R|<local>/tree|.<HIDDEN: /BaseClass.ui is invisible>#
         }
 
         public final fun bar(): R|kotlin/Unit| {
-            lval ui: R|ft<kotlin/String, kotlin/String?>| = this@R|test/User|.R|/BaseClass.ui|
+            lval ui: R|kotlin/String!| = this@R|test/User|.R|/BaseClass.ui|
         }
 
         public final fun baz(): R|kotlin/Unit| {
-            lval ui: R|ft<kotlin/String, kotlin/String?>| = this@R|test/User|.R|/BaseClass.ui|
+            lval ui: R|kotlin/String!| = this@R|test/User|.R|/BaseClass.ui|
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.fir.txt
index 8a0ad6c9e71..31ee194fe96 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/IntersectionWithJavaString.fir.txt
@@ -1,6 +1,6 @@
 FILE: IntersectionWithJavaString.kt
     public final fun collapse(path: R|kotlin/String|): R|kotlin/Unit| {
-        lval result: R|ft<kotlin/String, kotlin/String?>| = (R|<local>/path| as R|java/lang/String|).R|java/lang/String.replace|(String(123), String(456))
+        lval result: R|kotlin/String!| = (R|<local>/path| as R|java/lang/String|).R|java/lang/String.replace|(String(123), String(456))
         when () {
             !==(R|<local>/result|, R|<local>/path|) ->  {
             }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
index e47322ac9ac..1c0081c4773 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            this@R|/B|.R|SubstitutionOverride</B.foo: R|ft<Some, Some?>|>|(R|/Some.Some|())
+            this@R|/B|.R|SubstitutionOverride</B.foo: R|Some!|>|(R|/Some.Some|())
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
index a0f43dc1dbc..d6de8e467b1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
@@ -7,7 +7,7 @@ FILE: jvm.kt
         public final fun test(): R|kotlin/Unit| {
             lval res1: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(1))
             lval res2: R|kotlin/Boolean| = this@R|/A|.R|/Some.foo|(Int(-1))
-            lval res3: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
+            lval res3: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>| = this@R|/A|.R|/Some.bar|(R|kotlin/intArrayOf|(vararg(Int(0), Int(2), Int(-2))))
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
index 82fdb163f95..545a4a8b138 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
@@ -1,14 +1,14 @@
 FILE: main.kt
     public final fun main(): R|kotlin/Unit| {
-        Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|ft<kotlin/Int, kotlin/Int?>| <inline=NoInline>  {
+        Q|JavaClass|.R|/JavaClass.foo1|(<L> = foo1@fun <anonymous>(): R|kotlin/Int!| <inline=NoInline>  {
             ^ Int(123)
         }
         )
-        Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaClass|.R|/JavaClass.foo2|(<L> = foo2@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(2)).R|kotlin/Int.toString|()
         }
         )
-        Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaClass|.R|/JavaClass.foo2|(foo2@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(3)).R|kotlin/Int.toString|()
         }
         )
@@ -17,7 +17,7 @@ FILE: main.kt
         }
 
         Q|JavaClass|.R|/JavaClass.foo2|(R|<local>/y|)
-        Q|JavaClass|.R|/JavaClass.foo3|<R|ft<kotlin/Int, kotlin/Int?>|>(foo3@fun <anonymous>(it: R|ft<kotlin/Int, kotlin/Int?>|): R|ft<kotlin/String, kotlin/String?>| <inline=NoInline>  {
+        Q|JavaClass|.R|/JavaClass.foo3|<R|kotlin/Int!|>(foo3@fun <anonymous>(it: R|kotlin/Int!|): R|kotlin/String!| <inline=NoInline>  {
             ^ R|<local>/it|.R|kotlin/Int.plus|(Int(4)).R|kotlin/Int.toString|()
         }
         , Int(5))
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
index 3e7754470bb..8055fd223ae 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
@@ -5,5 +5,5 @@ FILE: test.kt
         ^select R|<local>/x|
     }
     public final fun test(d1: R|jvm/DiagnosticWithParameters1<*, *>|, d2: R|jvm/DiagnosticWithParameters2<*, *, *>|): R|kotlin/Unit| {
-        lval res: R|ft<kotlin/Any, kotlin/Any?>| = R|jvm/select|<R|ft<kotlin/Any, kotlin/Any?>|>(R|<local>/d1|.R|jvm/DiagnosticWithParameters1.a|, R|<local>/d2|.R|jvm/DiagnosticWithParameters2.b|)
+        lval res: R|kotlin/Any!| = R|jvm/select|<R|kotlin/Any!|>(R|<local>/d1|.R|jvm/DiagnosticWithParameters1.a|, R|<local>/d2|.R|jvm/DiagnosticWithParameters2.b|)
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
index 52a5460f59a..698911621c8 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
@@ -1,8 +1,8 @@
 FILE: Test.kt
     public final fun test(): R|kotlin/Unit| {
         lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/jc|.R|/JavaClass.text|
+        lval result: R|kotlin/String!| = R|<local>/jc|.R|/JavaClass.text|
     }
     public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/jc|.R|/JavaClass.text|
+        lval result: R|kotlin/String!| = R|<local>/jc|.R|/JavaClass.text|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
index ce01d359515..1cd6868b1a3 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
@@ -1,3 +1,3 @@
 FILE: test.kt
-    public final val x: R|ft<kotlin/String, kotlin/String?>| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
-        public get(): R|ft<kotlin/String, kotlin/String?>|
+    public final val x: R|kotlin/String!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
+        public get(): R|kotlin/String!|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
index db1ea806092..4dad0f1c42c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
@@ -16,7 +16,7 @@ FILE: K2.kt
         }
 
         public final fun bar(): R|kotlin/Unit| {
-            this@R|/K2|.R|SubstitutionOverride</J1.foo: R|ft<kotlin/Int, kotlin/Int?>|>|(Int(1))
+            this@R|/K2|.R|SubstitutionOverride</J1.foo: R|kotlin/Int!|>|(Int(1))
             this@R|/K2|.R|/J1.baz|()
         }
 
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
index 467bb7328ef..6c2d29035ed 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
@@ -7,7 +7,7 @@ FILE: K1.kt
     }
 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|.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())
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
index 7420d1f5c54..baa232b7870 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
@@ -1,6 +1,6 @@
 FILE: test.kt
     public final fun test(): R|kotlin/Unit| {
-        lval logger: R|ft<Logger, Logger?>| = Q|Logger|.R|/Logger.getInstance|(String(test))
+        lval logger: R|Logger!| = Q|Logger|.R|/Logger.getInstance|(String(test))
     }
     public final class MyTest : R|kotlin/Any| {
         public constructor(): R|MyTest| {
@@ -10,7 +10,7 @@ FILE: test.kt
         private final val klass: R|java/lang/Class<out MyTest>| = <getClass>(this@R|/MyTest|).R|kotlin/jvm/java|<R|CapturedType(out MyTest)|>
             private get(): R|java/lang/Class<out MyTest>|
 
-        private final val logger: R|ft<Logger, Logger?>| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
-            private get(): R|ft<Logger, Logger?>|
+        private final val logger: R|Logger!| = Q|Logger|.R|/Logger.getInstance|(this@R|/MyTest|.R|/MyTest.klass|)
+            private get(): R|Logger!|
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
index e64c57a0215..ecdd91d6d5d 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
@@ -7,7 +7,7 @@ FILE: main.kt
     }
     public final fun test(): R|kotlin/Unit| {
         lval b: R|MyMapEntry| = R|/MyMapEntry.MyMapEntry|()
-        lval key: R|ft<kotlin/String, kotlin/String?>| = R|<local>/b|.R|/Test.MapEntryImpl.key|
-        lval value: R|ft<kotlin/String, kotlin/String?>| = R|<local>/b|.R|/Test.MapEntryImpl.value|
+        lval key: R|kotlin/String!| = R|<local>/b|.R|/Test.MapEntryImpl.key|
+        lval value: R|kotlin/String!| = R|<local>/b|.R|/Test.MapEntryImpl.value|
         R|<local>/b|.R|/Test.MapEntryImpl.setValue|(Null(null))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
index cbc2582c660..19ba3671d90 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
@@ -8,15 +8,15 @@ FILE: test.kt
     public final fun test(e: R|MyException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
+        lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
     }
     public final fun test(e: R|YourException|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
+        lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
     }
     public final fun test(e: R|kotlin/Exception|, stream: R|java/io/PrintStream|): R|kotlin/Unit| {
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|()
         R|<local>/e|.R|kotlin/Throwable.printStackTrace|(R|<local>/stream|)
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
+        lval result: R|kotlin/String!| = R|<local>/e|.R|kotlin/Throwable.getLocalizedMessage|()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
index 134890c19dd..c0a9a2db1d7 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
@@ -1,8 +1,8 @@
 FILE: test.kt
     public abstract interface UseIterable : R|MyIterable<kotlin/String>| {
         public open fun test(): R|kotlin/Unit| {
-            lval it: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>|>|()
-            lval split: R|java/util/Spliterator<ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.spliterator: R|@EnhancedNullability java/util/Spliterator<ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>>|>|()
+            lval it: R|kotlin/collections/MutableIterator<kotlin/String!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.iterator: R|kotlin/collections/MutableIterator<kotlin/String!>|>|()
+            lval split: R|java/util/Spliterator<@EnhancedNullability kotlin/String!>| = this@R|/UseIterable|.R|SubstitutionOverride</UseIterable.spliterator: R|@EnhancedNullability java/util/Spliterator<@EnhancedNullability kotlin/String!>|>|()
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
index b90d19e4569..0ed3fe7f221 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
@@ -1,20 +1,20 @@
 FILE: test.kt
     public final fun test(map: R|MyMap|): R|kotlin/Unit| {
-        lval result: R|ft<kotlin/String, kotlin/String?>| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(String(key), <L> = getOrPut@fun <anonymous>(): R|ft<kotlin/String, kotlin/String?>| <inline=Inline, kind=UNKNOWN>  {
+        lval result: R|kotlin/String!| = R|<local>/map|.R|kotlin/collections/getOrPut|<R|kotlin/String!|, R|kotlin/String!|>(String(key), <L> = getOrPut@fun <anonymous>(): R|kotlin/String!| <inline=Inline, kind=UNKNOWN>  {
             ^ String(value)
         }
         )
-        lval otherResult: R|ft<kotlin/String, kotlin/String?>| = R|<local>/map|.R|SubstitutionOverride</MyMap.getOrDefault: R|ft<kotlin/String, kotlin/String?>|>|(String(key), String(value))
+        lval otherResult: R|kotlin/String!| = R|<local>/map|.R|SubstitutionOverride</MyMap.getOrDefault: R|kotlin/String!|>|(String(key), String(value))
         lval anotherResult: R|kotlin/String?| = R|<local>/map|.R|SubstitutionOverride</MyMap.replace: R|kotlin/String?|>|(String(key), String(value))
-        R|<local>/map|.R|SubstitutionOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|, value: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|): R|kotlin/Unit| <inline=NoInline>  {
+        R|<local>/map|.R|SubstitutionOverride</MyMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|@EnhancedNullability kotlin/String!|, value: R|@EnhancedNullability kotlin/String!|): R|kotlin/Unit| <inline=NoInline>  {
             R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
         }
         )
-        R|<local>/map|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-            lval key: R|ft<kotlin/String, kotlin/String?>| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>()
-            lval value: R|ft<kotlin/String, kotlin/String?>| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>()
+        R|<local>/map|.R|kotlin/collections/forEach|<R|kotlin/String!|, R|kotlin/String!|>(<L> = forEach@fun <anonymous>(<destruct>: R|kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+            lval key: R|kotlin/String!| = R|<local>/<destruct>|.R|kotlin/collections/component1|<R|kotlin/String!|, R|kotlin/String!|>()
+            lval value: R|kotlin/String!| = R|<local>/<destruct>|.R|kotlin/collections/component2|<R|kotlin/String!|, R|kotlin/String!|>()
             R|kotlin/io/println|(<strcat>(R|<local>/key|, String(: ), R|<local>/value|))
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
index b73f410b4ad..8db3a269fb8 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
@@ -1,5 +1,5 @@
 FILE: main.kt
     public final fun test(): R|kotlin/Unit| {
         lval project: R|kotlin/String| = Q|PlatformDataKeys|.R|/CommonDataKeys.PROJECT|
-        lval member: R|ft<kotlin/String, kotlin/String?>| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
+        lval member: R|kotlin/String!| = R|/PlatformDataKeys.PlatformDataKeys|().R|/CommonDataKeys.MEMBER|
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
index 0098712eeb5..720fcdbd396 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
@@ -13,7 +13,7 @@ FILE: User.kt
         protected abstract fun createSettings(): R|T|
 
         public final fun foo(): R|kotlin/Unit| {
-            this@R|/User|.R|/User.settings| = Q|StaticOwner|.R|/StaticOwner.newInstance|<R|ft<T, T?>|>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass|<R|ft<T, T?>|>)
+            this@R|/User|.R|/User.settings| = Q|StaticOwner|.R|/StaticOwner.newInstance|<R|T!|>(this@R|/User|.R|/User.settings|.R|kotlin/jvm/javaClass|<R|T!|>)
         }
 
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
index 99fa78c5f4f..f56dd54d3cf 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
@@ -1,13 +1,13 @@
 FILE: test.kt
     public final fun <D : R|kotlin/Any|> R|Call<D>|.testForEach(): R|kotlin/Unit| {
-        this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|, value: R|ft<@EnhancedNullability kotlin/String, @EnhancedNullability kotlin/String?>|): R|kotlin/Unit| <inline=NoInline>  {
+        this@R|/testForEach|.R|/Call.arguments|.R|SubstitutionOverride<kotlin/collections/MutableMap.forEach: R|kotlin/Unit|>|(<L> = forEach@fun <anonymous>(key: R|@EnhancedNullability kotlin/String!|, value: R|@EnhancedNullability kotlin/String!|): R|kotlin/Unit| <inline=NoInline>  {
             R|<local>/key|.R|kotlin/String.length|
             R|<local>/value|.R|kotlin/String.length|
         }
         )
-        this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/String, kotlin/String?>|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
-            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.key: R|ft<kotlin/String, kotlin/String?>|>|.R|kotlin/String.length|
-            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|ft<kotlin/String, kotlin/String?>|>|.R|kotlin/String.length|
+        this@R|/testForEach|.R|/Call.arguments|.R|kotlin/collections/forEach|<R|kotlin/String!|, R|kotlin/String!|>(<L> = forEach@fun <anonymous>(it: R|kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.key: R|kotlin/String!|>|.R|kotlin/String.length|
+            R|<local>/it|.R|SubstitutionOverride<kotlin/collections/Map.Entry.value: R|kotlin/String!|>|.R|kotlin/String.length|
         }
         )
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
index 0a76ccf0668..e0c53eb4bd1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
@@ -1,4 +1,4 @@
 FILE: capturedFlexible.kt
     public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| {
-        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out ft<java/util/zip/ZipEntry, java/util/zip/ZipEntry?>)|>()
+        R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out java/util/zip/ZipEntry!)|>()
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
index 7f2283eb79b..8bd8ba77195 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
@@ -1,4 +1,4 @@
 FILE: main.kt
     public final fun bar(bindingContext: R|BindingContext|): R|kotlin/Unit| {
-        R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/String, kotlin/String?>|, R|ft<kotlin/Double, kotlin/Double?>|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|ft<kotlin/Int, kotlin/Int?>|, R|ft<kotlin/String, kotlin/String?>|>(Q|Slices|.R|/Slices.Y|, Int(1)))
+        R|<local>/bindingContext|.R|/BindingContext.get|<R|kotlin/String!|, R|kotlin/Double!|>(Q|Slices|.R|/Slices.X|, R|<local>/bindingContext|.R|/BindingContext.get|<R|kotlin/Int!|, R|kotlin/String!|>(Q|Slices|.R|/Slices.Y|, Int(1)))
     }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
index 1352e3abbdb..f79a31161e3 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
@@ -1,6 +1,6 @@
 FILE: javaLangComparator.kt
     public final fun test_2(list: R|kotlin/collections/List<kotlin/Int>|): R|kotlin/Unit| {
-        lval comp: R|java/util/Comparator<kotlin/Int>| = Q|java/util|.R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|, y: R|ft<kotlin/Int, kotlin/Int?>|): R|kotlin/Int| <inline=NoInline>  {
+        lval comp: R|java/util/Comparator<kotlin/Int>| = Q|java/util|.R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|kotlin/Int!|, y: R|kotlin/Int!|): R|kotlin/Int| <inline=NoInline>  {
             ^ Int(1)
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
index b7ca67fd07b..aa1055498ac 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
@@ -1,6 +1,6 @@
 FILE: kotlinComparatorAlias.kt
     public final fun test_1(): R|kotlin/Unit| {
-        lval comp: R|java/util/Comparator<kotlin/Int>| = R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|ft<kotlin/Int, kotlin/Int?>|, y: R|ft<kotlin/Int, kotlin/Int?>|): R|kotlin/Int| <inline=NoInline>  {
+        lval comp: R|java/util/Comparator<kotlin/Int>| = R|java/util/Comparator|<R|kotlin/Int|>(<L> = Comparator@fun <anonymous>(x: R|kotlin/Int!|, y: R|kotlin/Int!|): R|kotlin/Int| <inline=NoInline>  {
             ^ Int(1)
         }
         )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/definitelyNotNullCast.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/definitelyNotNullCast.fir.txt
index bb861cb196e..6edb1e06d1a 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/definitelyNotNullCast.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/definitelyNotNullCast.fir.txt
@@ -10,5 +10,5 @@ FILE: test.kt
     }
     public final val generator: R|Generator| = R|/Generator.Generator|()
         public get(): R|Generator|
-    public final val y: R|Value| = (R|/generator|.R|/Generator.createValue|<R|ft<Value, Value?>|>(String(Omega)) as R|Value|)
+    public final val y: R|Value| = (R|/generator|.R|/Generator.createValue|<R|Value!|>(String(Omega)) as R|Value|)
         public get(): R|Value|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/immutableName.overrides.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/immutableName.overrides.txt
index 1b511e94c29..c8ab188889c 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/immutableName.overrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/immutableName.overrides.txt
@@ -1,13 +1,14 @@
 ImplDerived:
   [Source]: public abstract override fun foo(name: R|kotlin/String?|): R|Derived| from Use site scope of /ImplDerived [id: 0]
     [Source]: public open override fun foo(name: R|kotlin/String|): R|Base| from Use site scope of /Impl [id: 1]
-      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
-    [Enhancement]: public abstract fun foo(name: R|ft<kotlin/String, kotlin/String?>|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 3]
-      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
+      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
+    [Enhancement]: public abstract fun foo(name: R|kotlin/String!|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 3]
+      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
 
 DerivedImpl:
   [Source]: public abstract override fun foo(name: R|kotlin/String?|): R|Derived| from Use site scope of /DerivedImpl [id: 0]
-    [Enhancement]: public abstract fun foo(name: R|ft<kotlin/String, kotlin/String?>|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 1]
-      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
+    [Enhancement]: public abstract fun foo(name: R|kotlin/String!|): R|@EnhancedNullability Derived| from Java enhancement scope for /Derived [id: 1]
+      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
     [Source]: public open override fun foo(name: R|kotlin/String|): R|Base| from Use site scope of /Impl [id: 3]
-      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|ft<Base, Base?>| from Java enhancement scope for /Base [id: 2]
+      [Enhancement]: public abstract fun foo(name: R|@EnhancedNullability kotlin/String|): R|Base!| from Java enhancement scope for /Base [id: 2]
+
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
index 5c18e887730..7c478d2a506 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
@@ -2,7 +2,7 @@ FILE: samForComparator.kt
     public final fun foo(x: R|kotlin/Comparator<in kotlin/CharSequence>|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        R|/foo|(<L> = foo@fun <anonymous>(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, y: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|): R|kotlin/Int| <inline=NoInline>  {
+        R|/foo|(<L> = foo@fun <anonymous>(x: R|kotlin/CharSequence!|, y: R|kotlin/CharSequence!|): R|kotlin/Int| <inline=NoInline>  {
             ^ R|<local>/x|.R|kotlin/CharSequence.length|.R|kotlin/Int.minus|(R|<local>/y|.R|kotlin/CharSequence.length|)
         }
         )
diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
index 816ec106df1..8a238c0815e 100644
--- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
+++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
@@ -53,14 +53,28 @@ fun ConeKotlinType.render(renderFqNames: Boolean = true): String {
     } + nullabilitySuffix
 }
 
-private fun ConeFlexibleType.render(renderFqNames: Boolean): String =
-    buildString {
+private fun ConeFlexibleType.render(renderFqNames: Boolean): String {
+    if (lowerBound is ConeLookupTagBasedType && upperBound is ConeLookupTagBasedType &&
+        lowerBound.lookupTag == upperBound.lookupTag &&
+        lowerBound.nullability == ConeNullability.NOT_NULL && upperBound.nullability == ConeNullability.NULLABLE
+    ) {
+        if (lowerBound !is ConeClassLikeType || lowerBound.typeArguments.isEmpty()) {
+            if (upperBound !is ConeClassLikeType || upperBound.typeArguments.isEmpty()) {
+                return buildString {
+                    append(lowerBound.render(renderFqNames))
+                    append("!")
+                }
+            }
+        }
+    }
+    return buildString {
         append("ft<")
         append(lowerBound.render(renderFqNames))
         append(", ")
         append(upperBound.render(renderFqNames))
         append(">")
     }
+}
 
 private fun ConeKotlinType.renderAttributes(): String {
     if (!attributes.any()) return ""
diff --git a/compiler/testData/cli/jvm/firDeprecationJava.out b/compiler/testData/cli/jvm/firDeprecationJava.out
index 246e0bea996..31e71154540 100644
--- a/compiler/testData/cli/jvm/firDeprecationJava.out
+++ b/compiler/testData/cli/jvm/firDeprecationJava.out
@@ -5,11 +5,11 @@ compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...)
 ' is deprecated. Deprecated in Java
     thread.stop()
            ^
-compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: ft<String, String?>, b: Int, c: Double): ft<String, String?>
+compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: String!, b: Int, c: Double): String!
 ' is deprecated. Deprecated in Java
     JavaClass().bar("", 1, 2.0)
                 ^
-compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: ft<List, List?>
+compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: List!
 ' is deprecated. Deprecated in Java
     val baz = JavaClass().baz
                           ^
diff --git a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
index 2ae5891b1ca..fc453a05437 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
@@ -1,14 +1,14 @@
 public open class ArrayInGenericArguments : R|kotlin/Any| {
-    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+    public final static field X: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, ArrayInGenericArguments.DataKey<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
-    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>, ArrayInGenericArguments.DataKey<ft<kotlin/IntArray, kotlin/IntArray?>>?>|
+    public final static field Y: R|ft<ArrayInGenericArguments.DataKey<kotlin/IntArray!>, ArrayInGenericArguments.DataKey<kotlin/IntArray!>?>|
 
-    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>?>|
+    public final static field Z: R|ft<ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>, ArrayInGenericArguments.DataKey<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>?>|
 
     public constructor(): R|ArrayInGenericArguments|
 
-    public open class DataKey<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|ArrayInGenericArguments.DataKey<T>|
+    public open class DataKey<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public constructor<T : R|kotlin/Any!|>(): R|ArrayInGenericArguments.DataKey<T>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
index 334b2aaa870..ace459b6d90 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|
+    public final fun toArray(p0: R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|): R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|
 
     public constructor(): R|test/ArrayTypeVariance|
 
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
index db082a2f7ab..1777fcd10ef 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypeP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypeP<P>|
+public final class ClassWithTypeP<P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|>(): R|test/ClassWithTypeP<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
index 445e3e835c9..9c9ce025b3c 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
@@ -1,4 +1,4 @@
-public abstract class ClassWithTypePExtendsIterableP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P & Any, P?>>| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypePExtendsIterableP<P>|
+public abstract class ClassWithTypePExtendsIterableP<P : R|kotlin/Any!|> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<ft<P & Any, P?>>| {
+    public constructor<P : R|kotlin/Any!|>(): R|test/ClassWithTypePExtendsIterableP<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
index 11bea72a5f6..dc773c22017 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePP<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|>(): R|test/ClassWithTypePP<P, Q>|
+public final class ClassWithTypePP<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|>(): R|test/ClassWithTypePP<P, Q>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
index 42ef77a5c26..3d44aeb3776 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<R : R|ft<kotlin/collections/MutableIterable<ft<P & Any, P?>>, kotlin/collections/Iterable<ft<P & Any, P?>>?>|, P : R|kotlin/Any!|>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
index 19d51f1f016..fcb1cab37ee 100644
--- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
@@ -1,5 +1,5 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>>, kotlin/Array<out ft<java/io/File, java/io/File?>>?>|
+    public open field files: R|ft<kotlin/Array<java/io/File!>, kotlin/Array<out java/io/File!>?>|
 
     public constructor(): R|test/FieldOfArrayType|
 
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
index 868c0d1bd50..8756526564c 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
@@ -4,15 +4,15 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun foo(): R|kotlin/CharSequence!|
 
-        public abstract fun bar(): R|ft<kotlin/String, kotlin/String?>|
+        public abstract fun bar(): R|kotlin/String!|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+        public abstract fun foo(): R|kotlin/String!|
 
-        public abstract fun bar(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun bar(): R|kotlin/CharSequence!|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
index a89ada7f63c..a08bfccbd96 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
@@ -1,15 +1,15 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
     public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
 
-    public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<ft<kotlin/String, kotlin/String?>, ft<kotlin/CharSequence, kotlin/CharSequence?>>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String!, kotlin/CharSequence!>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence!, kotlin/String!>| {
     }
-    public abstract interface Super1<F : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super1<F : R|kotlin/Any!|, B : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<F & Any, F?>|
 
         public abstract fun bar(): R|ft<B & Any, B?>|
 
     }
-    public abstract interface Super2<FF : R|ft<kotlin/Any, kotlin/Any?>|, BB : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<FF : R|kotlin/Any!|, BB : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<FF & Any, FF?>|
 
         public abstract fun bar(): R|ft<BB & Any, BB?>|
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
index 19613056b94..1937cc299b8 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
@@ -1,7 +1,7 @@
-public open class InnerClassReferencesOuterTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassReferencesOuterTP<P>|
+public open class InnerClassReferencesOuterTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|>(): R|test/InnerClassReferencesOuterTP<P>|
 
-    public open inner class Inner<Q : R|ft<P & Any, P?>|, P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class Inner<Q : R|ft<P & Any, P?>|, P : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassReferencesOuterTP<P>.constructor<Q : R|ft<P & Any, P?>|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index c1dbfec166a..5f63b4e64ae 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -1,23 +1,23 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
-    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|
+    public open fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>, test/InnerClassTypeMultipleGeneric.Outer.Inner<kotlin/Byte!, kotlin/Char!, kotlin/Boolean!>?>|
 
     public constructor(): R|test/InnerClassTypeMultipleGeneric|
 
-    public open inner class BaseOuter<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
+    public open inner class BaseOuter<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
+        public test/InnerClassTypeMultipleGeneric.constructor<H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
 
-        public abstract inner class BaseInner<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|, H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-            public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
+        public abstract inner class BaseInner<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|, H1 : R|kotlin/Any!|, H2 : R|kotlin/Any!|> : R|kotlin/Any| {
+            public test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>.constructor<H3 : R|kotlin/Any!|, H4 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
 
         }
     }
-    public open inner class Outer<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>| {
-        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1 & Any, E1?>>?>|
+    public open inner class Outer<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<kotlin/Int!, ft<E1 & Any, E1?>>| {
+        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, kotlin/CharSequence!, kotlin/Int!, ft<E1 & Any, E1?>>?>|
 
-        public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
+        public test/InnerClassTypeMultipleGeneric.constructor<E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
 
-        public open inner class Inner<E3 : R|ft<kotlin/Any, kotlin/Any?>|, E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<kotlin/Double, kotlin/Double?>, ft<kotlin/String, kotlin/String?>, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
-            public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
+        public open inner class Inner<E3 : R|kotlin/Any!|, E1 : R|kotlin/Any!|, E2 : R|kotlin/Any!|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<kotlin/Double!, kotlin/String!, ft<E2 & Any, E2?>, ft<E3 & Any, E3?>>| {
+            public test/InnerClassTypeMultipleGeneric.Outer<E1, E2>.constructor<E3 : R|kotlin/Any!|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
 
         }
     }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
index 2bdcb5e1452..e604ed7841b 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
@@ -1,11 +1,11 @@
-public open class InnerClassesInGeneric<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassesInGeneric<P, Q>|
+public open class InnerClassesInGeneric<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|, Q : R|kotlin/Any!|>(): R|test/InnerClassesInGeneric<P, Q>|
 
-    public open inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class Inner<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|kotlin/Any| {
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
 
     }
-    public open inner class Inner2<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
+    public open inner class Inner2<P : R|kotlin/Any!|, Q : R|kotlin/Any!|> : R|test/InnerClassesInGeneric.Inner<ft<P & Any, P?>, ft<Q & Any, Q?>>| {
         public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<P & Any, P?>>, kotlin/collections/Iterator<ft<P & Any, P?>>?>|
 
         public test/InnerClassesInGeneric<P, Q>.constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
index 1da6bd40cbd..78c5f51b2f7 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
@@ -1,28 +1,28 @@
 public open class InnerOfGeneric : R|kotlin/Any| {
     public constructor(): R|test/InnerOfGeneric|
 
-    public abstract inner class A<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public test/InnerOfGeneric.constructor<K : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.A<K>|
+    public abstract inner class A<K : R|kotlin/Any!|> : R|kotlin/Any| {
+        public test/InnerOfGeneric.constructor<K : R|kotlin/Any!|>(): R|test/InnerOfGeneric.A<K>|
 
-        public abstract inner class Inner<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
+        public abstract inner class Inner<K : R|kotlin/Any!|> : R|test/InnerOfGeneric.S<ft<K & Any, K?>>| {
             public test/InnerOfGeneric.A<K>.constructor(): R|test/InnerOfGeneric.A.Inner<K>|
 
         }
     }
-    public open inner class B<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
-        public test/InnerOfGeneric.constructor<L : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.B<L>|
+    public open inner class B<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A<ft<L & Any, L?>>| {
+        public test/InnerOfGeneric.constructor<L : R|kotlin/Any!|>(): R|test/InnerOfGeneric.B<L>|
 
-        public open inner class SubInner<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
+        public open inner class SubInner<L : R|kotlin/Any!|> : R|test/InnerOfGeneric.A.Inner<ft<L & Any, L?>>| {
             @R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<L & Any, L?>>, kotlin/collections/Iterator<ft<L & Any, L?>>?>|
 
             public test/InnerOfGeneric.B<L>.constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
 
         }
     }
-    public open inner class S<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class S<E : R|kotlin/Any!|> : R|kotlin/Any| {
         public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E & Any, E?>>, kotlin/collections/Iterator<ft<E & Any, E?>>?>|
 
-        public test/InnerOfGeneric.constructor<E : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.S<E>|
+        public test/InnerOfGeneric.constructor<E : R|kotlin/Any!|>(): R|test/InnerOfGeneric.S<E>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
index 62691a7bc2b..390faac61f1 100644
--- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
@@ -1,12 +1,12 @@
 public abstract interface IntrinsicCompanionObject : R|kotlin/Any| {
-    public abstract fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|): R|kotlin/Unit|
+    public abstract fun testInt(i: R|kotlin/Int.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|): R|kotlin/Unit|
+    public abstract fun testChar(c: R|kotlin/Char.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|): R|kotlin/Unit|
+    public abstract fun testString(s: R|kotlin/String.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|): R|kotlin/Unit|
+    public abstract fun testBoolean(b: R|kotlin/Boolean.Companion!|): R|kotlin/Unit|
 
-    public abstract fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|): R|kotlin/Unit|
+    public abstract fun testEnum(e: R|kotlin/Enum.Companion!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
index a1425a87e24..7204a94751f 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
@@ -1,7 +1,7 @@
-public final class MethodReferencesOuterClassTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodReferencesOuterClassTP<P>|
+public final class MethodReferencesOuterClassTP<P : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Any!|>(): R|test/MethodReferencesOuterClassTP<P>|
 
-    public final inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public final inner class Inner<P : R|kotlin/Any!|> : R|kotlin/Any| {
         public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
 
         public test/MethodReferencesOuterClassTP<P>.constructor(): R|test/MethodReferencesOuterClassTP.Inner<P>|
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
index 200c4890900..b20e75c555a 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> bar(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable!|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
index d216b04338c..cc2e5456b77 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|, R|ft<java/lang/Runnable, java/lang/Runnable?>|> foo(): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Cloneable!|, R|java/lang/Runnable!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
index c4760d869b9..c1100ced216 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypeP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|> f(): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
index 86805b310f0..dc1522ddbf4 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|, Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
index 7d5db7672c1..6b194aa5779 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
@@ -1,6 +1,6 @@
-public open class MethodWithTypePRefClassP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class MethodWithTypePRefClassP<P : R|kotlin/Any!|> : R|kotlin/Any| {
     public final fun <Q : R|ft<P & Any, P?>|> f(): R|kotlin/Unit|
 
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodWithTypePRefClassP<P>|
+    public constructor<P : R|kotlin/Any!|>(): R|test/MethodWithTypePRefClassP<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
index e7a19e2d516..78467642eea 100644
--- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
-    public final fun <P : R|ft<kotlin/Any, kotlin/Any?>|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
+    public final fun <P : R|kotlin/Any!|> f(p: R|ft<P & Any, P?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethosWithPRefTP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MyException.fir.txt b/compiler/testData/loadJava/compiledJava/MyException.fir.txt
index 5628c9d62e3..3f008dc0d3e 100644
--- a/compiler/testData/loadJava/compiledJava/MyException.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MyException.fir.txt
@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(message: R|ft<kotlin/String, kotlin/String?>|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|): R|test/MyException|
+    public constructor(message: R|kotlin/String!|, cause: R|kotlin/Throwable!|): R|test/MyException|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
index dbb0e12e861..64061f2177d 100644
--- a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
@@ -2,7 +2,7 @@ public open class OverrideMethod : R|kotlin/Any| {
     public constructor(): R|test/OverrideMethod|
 
     public/*package*/ open inner class Base : R|test/OverrideMethod.SuperBase| {
-        public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+        public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
 
         public/*package*/ open fun bar(): R|kotlin/Unit|
 
@@ -10,7 +10,7 @@ public open class OverrideMethod : R|kotlin/Any| {
 
     }
     public/*package*/ open inner class Derived : R|test/OverrideMethod.Base| {
-        @R|java/lang/Override|() public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+        @R|java/lang/Override|() public/*package*/ open fun foo(s: R|kotlin/String!|): R|kotlin/String!|
 
         public/*package*/ open fun baz(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
index 380ae6a89c7..5f92f2aa287 100644
--- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
@@ -1,11 +1,11 @@
 public open class Frame : R|kotlin/Any| {
-    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|
+    public/*package*/ open field accessibleContext: R|kotlin/String!|
 
     public constructor(): R|awt/Frame|
 
 }
 public open class JFrame : R|awt/Frame| {
-    protected/*protected and package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|
+    protected/*protected and package*/ open field accessibleContext: R|kotlin/String!|
 
     public constructor(): R|test/JFrame|
 
diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
index f17b5c92acc..0332dd2dc39 100644
--- a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
@@ -1,26 +1,26 @@
 public open class RawOverrides : R|kotlin/Any| {
     public constructor(): R|test/RawOverrides|
 
-    public abstract interface A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public abstract fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(x: R|ft<T & Any, T?>|, y: R|ft<kotlin/collections/MutableList<out ft<T & Any, T?>>, kotlin/collections/List<out ft<T & Any, T?>>?>|): R|ft<E & Any, E?>|
+    public abstract interface A<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public abstract fun <E : R|kotlin/CharSequence!|> foo(x: R|ft<T & Any, T?>|, y: R|ft<kotlin/collections/MutableList<out ft<T & Any, T?>>, kotlin/collections/List<out ft<T & Any, T?>>?>|): R|ft<E & Any, E?>|
 
     }
-    public open inner class B : R|kotlin/Any|, R|test/RawOverrides.A<ft<kotlin/Any, kotlin/Any?>>| {
-        @R|java/lang/Override|() public open fun foo(x: R|ft<kotlin/Any, kotlin/Any?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open inner class B : R|kotlin/Any|, R|test/RawOverrides.A<kotlin/Any!>| {
+        @R|java/lang/Override|() public open fun foo(x: R|kotlin/Any!|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.B|
 
     }
     public open inner class C : R|kotlin/Any| {
-        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
+        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.C|
 
     }
     public open inner class D : R|test/RawOverrides.C| {
-        @R|java/lang/Override|() public open fun bar(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+        @R|java/lang/Override|() public open fun bar(x: R|kotlin/CharSequence!|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/String!|
 
-        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
+        public/*package*/ open fun <E : R|kotlin/CharSequence!|, F : R|ft<E & Any, E?>|> bar(x: R|ft<F & Any, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E & Any, E?>, ft<F & Any, F?>>, kotlin/collections/Map<ft<E & Any, E?>, ft<F & Any, F?>>?>>?>|): R|ft<E & Any, E?>|
 
         public test/RawOverrides.constructor(): R|test/RawOverrides.D|
 
diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
index 7f272605516..01b96f0e096 100644
--- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface RawTypeWithUpperBound : R|kotlin/Any| {
     public abstract interface Bar : R|kotlin/Any| {
-        public abstract fun f(f: R|ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>|): R|kotlin/Unit|
+        public abstract fun f(f: R|ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>|): R|kotlin/Unit|
 
-        public abstract fun g(f: R|ft<kotlin/collections/MutableList<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>, kotlin/collections/List<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>?>|): R|kotlin/Unit|
+        public abstract fun g(f: R|ft<kotlin/collections/MutableList<ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>>, kotlin/collections/List<ft<test/RawTypeWithUpperBound.Foo<kotlin/CharSequence!>, test/RawTypeWithUpperBound.Foo<*>?>>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Foo<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface Foo<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
index 9ca5f1ebaf2..1750667e948 100644
--- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public abstract fun f(collection: R|ft<kotlin/collections/MutableCollection<out kotlin/CharSequence!>, kotlin/collections/Collection<out kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
-    public abstract fun f(comparator: R|ft<kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Comparable<in ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public abstract fun f(comparator: R|ft<kotlin/Comparable<in kotlin/CharSequence!>, kotlin/Comparable<in kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
index e44311bff8c..0db6daf14b9 100644
--- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
@@ -1,5 +1,5 @@
 public open class TopLevel$Class : R|kotlin/Any| {
-    public open fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|): R|kotlin/Unit|
+    public open fun foo(other: R|test/TopLevel$Class!|): R|kotlin/Unit|
 
     public constructor(): R|test/TopLevel$Class|
 
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
index 42dc0dfa1fc..2ee027a47df 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
@@ -5,6 +5,6 @@ public final class UnboundWildcard : R|kotlin/Any| {
 
     public constructor(): R|test/UnboundWildcard|
 
-    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
index 07f5565509e..61fb2af0469 100644
--- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
@@ -1,10 +1,10 @@
 public open class WildcardBounds : R|kotlin/Any| {
-    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/WildcardBounds.A<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|, y: R|ft<test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>>, test/WildcardBounds.A<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public/*package*/ open fun foo(x: R|ft<test/WildcardBounds.A<out kotlin/CharSequence!>, test/WildcardBounds.A<out kotlin/CharSequence!>?>|, y: R|ft<test/WildcardBounds.A<in kotlin/String!>, test/WildcardBounds.A<in kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/WildcardBounds|
 
-    public/*package*/ open class A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public/*package*/ constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/WildcardBounds.A<T>|
+    public/*package*/ open class A<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ constructor<T : R|kotlin/Any!|>(): R|test/WildcardBounds.A<T>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
index 155233ccc86..8e2a304cc44 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
@@ -6,11 +6,11 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotli
 
     }
     public/*package*/ open inner class Inner : R|kotlin/Any| {
-        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
+        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
 
     }
-    public/*package*/ open inner class InnerGeneric<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
+    public/*package*/ open inner class InnerGeneric<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|kotlin/Any!|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
index 8465c52ca1a..4058a6c9b55 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
-    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String?>|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String?>|): R|kotlin/Unit|
+    public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(a))  kotlin/String!|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(b))  kotlin/String!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
index b4f1cd32253..757fed490a9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
@@ -1,5 +1,5 @@
 public open class AnnotatedValueParameter : R|kotlin/Any| {
-    public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/AnnotatedValueParameter|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
index 2327dfe7ec2..be9fc5a1fde 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
@@ -5,7 +5,7 @@ public open class ClassObjectArrayInParam : R|kotlin/Any| {
         public constructor(vararg value: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectArrayInParam.Anno|
 
     }
-    @R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/IntArray, kotlin/IntArray?>>, kotlin/Array<out ft<kotlin/IntArray, kotlin/IntArray?>>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|test/ClassObjectArrayInParam!|)), <getClass>(<getClass>(R|test/ClassObjectArrayInParam.Nested!|)), <getClass>(<getClass>(R|kotlin/String!|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/Array<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<kotlin/IntArray!>, kotlin/Array<out kotlin/IntArray!>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectArrayInParam.Nested|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
index 8365f9cab8e..e15dc67061a 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
@@ -5,7 +5,7 @@ public open class ClassObjectInParam : R|kotlin/Any| {
         public constructor(value: R|kotlin/reflect/KClass<*>|): R|test/ClassObjectInParam.Anno|
 
     }
-    @R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParam, test/ClassObjectInParam?>|))) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParam!|))) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectInParam.Nested|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
index 641a83e3488..23466095463 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
@@ -5,7 +5,7 @@ public open class ClassObjectInParamRaw : R|kotlin/Any| {
         public constructor(value: R|kotlin/reflect/KClass<*>|, arg: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectInParamRaw.Anno|
 
     }
-    @R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParamRaw, test/ClassObjectInParamRaw?>|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
+    @R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParamRaw!|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/ClassObjectInParamRaw.Nested|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
index 0984a0501db..4871524fa95 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
@@ -2,7 +2,7 @@ public open class ClassObjectInParamVariance : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectInParamVariance|
 
     public final annotation class Anno : R|kotlin/Annotation| {
-        public constructor(arg1: R|kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>|, arg2: R|kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|): R|test/ClassObjectInParamVariance.Anno|
+        public constructor(arg1: R|kotlin/reflect/KClass<out kotlin/Int!>|, arg2: R|kotlin/reflect/KClass<in kotlin/Int!>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out kotlin/Int!>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in kotlin/Int!>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|): R|test/ClassObjectInParamVariance.Anno|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
index 9d1b11bf2be..2a4c481b08b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
@@ -3,7 +3,7 @@ public abstract interface CustomAnnotation : R|kotlin/Any| {
         public constructor(value: R|test/CustomAnnotation.MyEnum|): R|test/CustomAnnotation.MyAnnotation|
 
     }
-    public final enum class MyEnum : R|kotlin/Enum<ft<test/CustomAnnotation.MyEnum, test/CustomAnnotation.MyEnum?>>| {
+    public final enum class MyEnum : R|kotlin/Enum<test/CustomAnnotation.MyEnum!>| {
         public final static enum entry ONE: R|@EnhancedNullability test/CustomAnnotation.MyEnum|
         public final static fun values(): R|kotlin/Array<test/CustomAnnotation.MyEnum>| {
         }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
index 4c79dc99956..bcb243855c1 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
@@ -3,7 +3,7 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
 
     public constructor(): R|test/EnumArgumentWithCustomToString|
 
-    public final enum class E : R|kotlin/Enum<ft<test/EnumArgumentWithCustomToString.E, test/EnumArgumentWithCustomToString.E?>>| {
+    public final enum class E : R|kotlin/Enum<test/EnumArgumentWithCustomToString.E!>| {
         public final static enum entry CAKE: R|@EnhancedNullability test/EnumArgumentWithCustomToString.E|
         public final static fun values(): R|kotlin/Array<test/EnumArgumentWithCustomToString.E>| {
         }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
index 7235fc325e5..a79a56ed169 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
@@ -1,6 +1,6 @@
-public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>>| {
+public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter!>| {
     public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter|
-    private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|ft<kotlin/String, kotlin/String?>|): R|test/EnumConstructorParameter|
+    private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|kotlin/String!|): R|test/EnumConstructorParameter|
 
     private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
index 76308cfe25c..c7a99507f3b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
@@ -1,5 +1,5 @@
 public open class JavaDocDeprecated : R|kotlin/Any| {
-    public open fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getFoo(text: R|kotlin/String!|): R|kotlin/String!|
 
     public constructor(): R|test/JavaDocDeprecated|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
index 633d83531de..cad297185d6 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
@@ -7,7 +7,7 @@ public open class NestedEnumArgument : R|kotlin/Any| {
         public constructor(value: R|test/NestedEnumArgument.E|): R|test/NestedEnumArgument.Anno|
 
     }
-    public final enum class E : R|kotlin/Enum<ft<test/NestedEnumArgument.E, test/NestedEnumArgument.E?>>| {
+    public final enum class E : R|kotlin/Enum<test/NestedEnumArgument.E!>| {
         public final static enum entry FIRST: R|@EnhancedNullability test/NestedEnumArgument.E|
         public final static fun values(): R|kotlin/Array<test/NestedEnumArgument.E>| {
         }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
index 0410c2a9154..590e5f16283 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(cl: R|ft<java/lang/Class<ft<P & Any, P?>>, java/lang/Class<ft<P & Any, P?>>?>|): R|test/ConstructorGenericDeep|
+    public constructor<P : R|kotlin/Any!|>(cl: R|ft<java/lang/Class<ft<P & Any, P?>>, java/lang/Class<ft<P & Any, P?>>?>|): R|test/ConstructorGenericDeep|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
index 81ba747f8fa..3e62258cf2d 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericSimple|
+    public constructor<P : R|kotlin/Any!|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericSimple|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
index b3edc0ad914..b6b32231e1d 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor<P : R|ft<java/util/RandomAccess, java/util/RandomAccess?>|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|java/util/RandomAccess!|>(p: R|ft<P & Any, P?>|): R|test/ConstructorGenericUpperBound|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
index 1fe72a49dd8..9fea09a37ba 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
@@ -1,4 +1,4 @@
-public final enum class EnumMembers : R|kotlin/Enum<ft<test/EnumMembers, test/EnumMembers?>>| {
+public final enum class EnumMembers : R|kotlin/Enum<test/EnumMembers!>| {
     public final static enum entry FIRST: R|@EnhancedNullability test/EnumMembers|
     public final static enum entry SECOND: R|@EnhancedNullability test/EnumMembers|
     public final field isFirst: R|kotlin/Boolean|
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
index 6acd93fc9df..930ec6ec317 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
@@ -1,4 +1,4 @@
-public final enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>>| {
+public final enum class EnumWithSpecializedEntry : R|kotlin/Enum<test/EnumWithSpecializedEntry!>| {
     public final static enum entry E1: R|@EnhancedNullability test/EnumWithSpecializedEntry|
     public final static enum entry E2: R|@EnhancedNullability test/EnumWithSpecializedEntry|
     public final static fun values(): R|kotlin/Array<test/EnumWithSpecializedEntry>| {
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
index c3f15b08970..b8ef329dede 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
@@ -1,4 +1,4 @@
-public final enum class JavaEnum : R|kotlin/Enum<ft<test/JavaEnum, test/JavaEnum?>>| {
+public final enum class JavaEnum : R|kotlin/Enum<test/JavaEnum!>| {
     public final static enum entry ENTRY: R|@EnhancedNullability test/JavaEnum|
     public final static enum entry ANOTHER: R|@EnhancedNullability test/JavaEnum|
     public final static fun values(): R|kotlin/Array<test/JavaEnum>| {
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
index 00897bc6ecc..87ec516cec4 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
@@ -1,5 +1,5 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
-    public open fun setSomething(color: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setSomething(color: R|kotlin/String!|): R|kotlin/Unit|
 
     public open fun getSomething(): R|kotlin/Int|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
index f22758b1e75..9238c2c4a14 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getColor(): R|kotlin/String!|
 
     public constructor(): R|test/JavaBeanVal|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
index f59a1bc39b1..3c745cd7ac7 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|ft<kotlin/String, kotlin/String?>|
+    public open fun getColor(): R|kotlin/String!|
 
-    public open fun setColor(string: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setColor(string: R|kotlin/String!|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
index 26dae831ccf..2839e81ced7 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
@@ -1,8 +1,8 @@
-public open class JavaBeanVarOfGenericType<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class JavaBeanVarOfGenericType<P : R|kotlin/Any!|> : R|kotlin/Any| {
     public open fun getCharacters(): R|ft<java/util/ArrayList<ft<P & Any, P?>>, java/util/ArrayList<ft<P & Any, P?>>?>|
 
     public open fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P & Any, P?>>, java/util/ArrayList<ft<P & Any, P?>>?>|): R|kotlin/Unit|
 
-    public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/JavaBeanVarOfGenericType<P>|
+    public constructor<P : R|kotlin/Any!|>(): R|test/JavaBeanVarOfGenericType<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
index 06c046142fe..107addad830 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
@@ -1,5 +1,5 @@
 public open class TwoSetters : R|kotlin/Any| {
-    public open fun setSize(size: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public open fun setSize(size: R|kotlin/String!|): R|kotlin/Unit|
 
     public open fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
index ea72f561685..06a315db19f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    public open fun <T : R|ft<java/io/Serializable, java/io/Serializable?>|> foo(): R|kotlin/Unit|
+    public open fun <T : R|java/io/Serializable!|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
index 4b04666801b..e284cfb2fea 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
@@ -1,5 +1,5 @@
 public open class ArrayType : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+    public open fun foo(): R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|
 
     public constructor(): R|test/ArrayType|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
index aaa365760a2..d97040758ce 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt
@@ -1,4 +1,4 @@
-public open class ConstructorWithNewTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|, U : R|ft<kotlin/Any, kotlin/Any?>|>(first: R|ft<U & Any, U?>|): R|test/ConstructorWithNewTypeParams<T>|
+public open class ConstructorWithNewTypeParams<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<T : R|kotlin/Any!|, U : R|kotlin/Any!|>(first: R|ft<U & Any, U?>|): R|test/ConstructorWithNewTypeParams<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
index 8e958e00753..0cc29ba2615 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt
@@ -1,4 +1,4 @@
-public open class ConstructorWithParentTypeParams<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(first: R|ft<T & Any, T?>|): R|test/ConstructorWithParentTypeParams<T>|
+public open class ConstructorWithParentTypeParams<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<T : R|kotlin/Any!|>(first: R|ft<T & Any, T?>|): R|test/ConstructorWithParentTypeParams<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
index 80d174755f8..bacd58cdd2d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
-    public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|): R|test/ConstructorWithSeveralParams|
+    public constructor(integer: R|kotlin/Int!|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<kotlin/String!>, java/util/ArrayList<kotlin/String!>?>|): R|test/ConstructorWithSeveralParams|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
index 9c5c1356836..ac6f5a2cba5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
@@ -1,5 +1,5 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
-    public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+    public open fun foo(): R|ft<kotlin/collections/MutableList<kotlin/Number!>, kotlin/collections/List<kotlin/Number!>?>|
 
     public constructor(): R|test/CustomProjectionKind|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
index d94069012e3..755f7f1b9cb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|
+    public open fun foo(f: R|ft<kotlin/Function1<kotlin/String!, kotlin/String!>, kotlin/Function1<kotlin/String!, kotlin/String!>?>|): R|ft<kotlin/Function0<kotlin/String!>, kotlin/Function0<kotlin/String!>?>|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
index 9a5839ea948..9a01fd3fbfc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/MethodWithGenerics|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
index 02024c4f17b..9e9fad820f5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
@@ -1,7 +1,7 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T & Any, T?>>, kotlin/collections/MutableList<in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableList<ft<T & Any, T?>>, kotlin/collections/List<ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Any!|> copy(dest: R|ft<kotlin/collections/MutableList<in ft<T & Any, T?>>, kotlin/collections/MutableList<in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableList<ft<T & Any, T?>>, kotlin/collections/List<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T & Any, T?>>, kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T & Any, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T & Any, T?>>?>|): R|kotlin/Unit|
+    public open fun <T : R|kotlin/Any!|> copyMap(dest: R|ft<kotlin/collections/MutableMap<kotlin/String!, in ft<T & Any, T?>>, kotlin/collections/MutableMap<kotlin/String!, in ft<T & Any, T?>>?>|, src: R|ft<kotlin/collections/MutableMap<kotlin/String!, ft<T & Any, T?>>, kotlin/collections/Map<kotlin/String!, ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithMappedClasses|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
index 45523ae7ebe..d1dd15c7ae0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|, list: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>, kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|, list: R|ft<kotlin/collections/MutableList<in kotlin/String!>, kotlin/collections/MutableList<in kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
index f7fdf36779d..56a1a3629d1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithVararg : R|kotlin/Any| {
-    public open fun foo(vararg s: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun foo(vararg s: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithVararg|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
index 5be54802354..e2c06b2270e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
@@ -1,10 +1,10 @@
-public open class PropertyArrayTypes<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+public open class PropertyArrayTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public open field arrayOfArrays: R|ft<kotlin/Array<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/Array<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
-    public open field array: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+    public open field array: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|
 
     public open field genericArray: R|ft<kotlin/Array<ft<T & Any, T?>>, kotlin/Array<out ft<T & Any, T?>>?>|
 
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/PropertyArrayTypes<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/PropertyArrayTypes<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
index f23ef08a6d4..b6be986005d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
@@ -1,12 +1,12 @@
-public open class PropertyComplexTypes<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class PropertyComplexTypes<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public open field genericType: R|ft<T & Any, T?>|
 
-    public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|
+    public open field listDefinedGeneric: R|ft<java/util/ArrayList<kotlin/String!>, java/util/ArrayList<kotlin/String!>?>|
 
     public open field listGeneric: R|ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>|
 
     public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T & Any, T?>>, java/util/ArrayList<ft<T & Any, T?>>?>>?>|
 
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/PropertyComplexTypes<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/PropertyComplexTypes<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
index 627f61d302c..ea597d3b85b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
@@ -1,7 +1,7 @@
 public open class PropertySimpleType : R|kotlin/Any| {
-    public open field fieldOne: R|ft<kotlin/String, kotlin/String?>|
+    public open field fieldOne: R|kotlin/String!|
 
-    public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|
+    public open field fieldTwo: R|kotlin/String!|
 
     public constructor(): R|test/PropertySimpleType|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
index b8e262e2816..ffef7d49391 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
@@ -3,6 +3,6 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
-    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence!|> : R|kotlin/Any| {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
index d2a8cd3bf58..4705d2dd3a5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(from: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>>?>|, to: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>>?>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+    public open fun copy(from: R|ft<kotlin/Array<kotlin/Number!>, kotlin/Array<out kotlin/Number!>?>|, to: R|ft<kotlin/Array<kotlin/Number!>, kotlin/Array<out kotlin/Number!>?>|): R|ft<kotlin/collections/MutableList<kotlin/Number!>, kotlin/collections/List<kotlin/Number!>?>|
 
     public constructor(): R|test/WrongProjectionKind|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
index 55dc8781fa0..341578b319a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
index d7f7ffd3582..e47591c4335 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|): R|kotlin/Unit|
+    public open fun <A : R|kotlin/Any!|, B : R|java/lang/Runnable!|, R|ft<kotlin/collections/MutableList<kotlin/Cloneable!>, kotlin/collections/List<kotlin/Cloneable!>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<kotlin/collections/MutableList<out ft<B & Any, B?>>, kotlin/collections/List<out ft<B & Any, B?>>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
index 715e20dd9bd..93bf1974e2a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open fun foo(a: R|kotlin/String!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>>?>|): R|kotlin/String!|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
index d6084944f6d..538297fe793 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
@@ -1,30 +1,30 @@
 public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| {
     public abstract interface Sub : R|test/PropagateTypeArgumentNullable.Super| {
-        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
index c52c62a0dc0..d6d9c44b277 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface ChangeProjectionKind1 : R|kotlin/Any| {
     public abstract interface Sub : R|test/ChangeProjectionKind1.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
index f80ef8ff92d..f791c0e5636 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
@@ -1,13 +1,13 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
         public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
index 56e405304ec..e7a92063c93 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
@@ -1,11 +1,11 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
     }
-    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
index 35ef594c1fb..ecb00848444 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVararg.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
index d0c291967d9..81bb43c1230 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
index d3cf950cdbe..8bf3b623e6b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargNotNull.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
index 9ebf750ecd3..c014952cefc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
-        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
index eab2fc6c4b5..47bb9bf64c6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVararg.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
index bc6acdb1f37..fd78f3de1c0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargInteger.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
index bc75b4183f1..12a081ed62c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritVarargNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargNotNull.Super| {
-        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
index 775a404a66a..490eb7e591a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargPrimitive.Super| {
-        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
index 1fd5ebca775..5a5729b224a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
@@ -1,15 +1,15 @@
 public abstract interface Kt3302 : R|kotlin/Any| {
     public abstract interface BSONObject : R|kotlin/Any| {
-        public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
+        public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/Any, kotlin/Any?>>|, R|test/Kt3302.BSONObject| {
-        @R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
+    public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String!, kotlin/Any!>|, R|test/Kt3302.BSONObject| {
+        @R|java/lang/Override|() public abstract fun put(key: R|@EnhancedNullability kotlin/String|, value: R|@EnhancedNullability kotlin/Any|): R|kotlin/Any!|
 
     }
-    public abstract interface LinkedHashMap<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface LinkedHashMap<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun put(key: R|ft<K & Any, K?>|, value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
index 10f158f5790..6aea850d9e8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface MutableToReadOnly : R|kotlin/Any| {
     public abstract interface Sub : R|test/MutableToReadOnly.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
index cc5a104407d..6abbe8eca94 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
@@ -4,7 +4,7 @@ public abstract interface NullableToNotNull : R|kotlin/Any| {
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
index 56b180eee58..4891d7620b0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
index 36f310ec555..122863f5c3c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
@@ -1,9 +1,9 @@
 public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
-    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
-        public abstract fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
+        public abstract fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
index 48126c9b39e..02d79bd7e44 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface ReadOnlyToMutable : R|kotlin/Any| {
     public abstract interface Sub : R|test/ReadOnlyToMutable.Super| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
index 4aad1ac2415..53a939edd82 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
@@ -1,5 +1,5 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
-    public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Generic<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(key: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
@@ -11,7 +11,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<kotlin/String!>| {
         @R|java/lang/Override|() public abstract fun foo(key: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
index 18ea49c7dc3..0e1a6aaefbf 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
@@ -1,9 +1,9 @@
 public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
index 7857acc22ad..b654dc36d6f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
@@ -1,15 +1,15 @@
 public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<kotlin/String!>|, R|test/SubstitutedClassParameters.Super2<kotlin/String!>| {
+        public abstract fun foo(p: R|kotlin/String!|): R|kotlin/Unit|
 
     }
-    public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super1<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<E : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
index 5b371039204..50e434271d2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
@@ -4,7 +4,7 @@ public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| {
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun foo(): R|kotlin/CharSequence!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
index 14fe098af49..24f2171a9d7 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
@@ -4,7 +4,7 @@ public abstract interface AddNotNullSameJavaType : R|kotlin/Any| {
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun foo(): R|kotlin/CharSequence!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
index b75c6c7f53c..0fb00a3d3a6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface AddNullabilitySameGenericType1 : R|kotlin/Any| {
     public abstract interface Sub : R|test/AddNullabilitySameGenericType1.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
index 0165509fbbd..bd30b99279d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface AddNullabilitySameGenericType2 : R|kotlin/Any| {
     public abstract interface Sub : R|test/AddNullabilitySameGenericType2.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
index bac45ff864b..eb3df9d34fd 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface CantMakeImmutableInSubclass : R|kotlin/Any| {
     public abstract interface Sub : R|test/CantMakeImmutableInSubclass.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
index 287d2cf529d..845c0a768c5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
@@ -1,13 +1,13 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
         public abstract fun foo(): R|ft<E & Any, E?>|
 
     }
-    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<kotlin/String!>| {
+        public abstract fun foo(): R|kotlin/String!|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<T & Any, T?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
index 6c0af73efa9..c939c4370e9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
@@ -1,11 +1,11 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
-    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
+    public abstract interface Middle<E : R|kotlin/Any!|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
     }
-    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<kotlin/String!>| {
+        public abstract fun foo(): R|kotlin/String!|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<T & Any, T?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
index bb9d64b8611..08835e0005d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
@@ -1,14 +1,14 @@
 public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/HalfSubstitutedTypeParameters.Super| {
-        public abstract fun foo(): R|ft<test/HalfSubstitutedTypeParameters.TrickyList<ft<kotlin/Int, kotlin/Int?>, ft<kotlin/String, kotlin/String?>>, test/HalfSubstitutedTypeParameters.TrickyList<ft<kotlin/Int, kotlin/Int?>, ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int!, kotlin/String!>, test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int!, kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface TrickyList<X : R|ft<kotlin/Any, kotlin/Any?>|, E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableList<ft<E & Any, E?>>| {
+    public abstract interface TrickyList<X : R|kotlin/Any!|, E : R|kotlin/Any!|> : R|kotlin/collections/MutableList<ft<E & Any, E?>>| {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
index 19ff717d815..100d1a95a27 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNullabilityGenericSubclassSimple : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNullabilityGenericSubclassSimple.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
index 9033048fbc8..6ff6b22dcb8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNullabilitySameGenericType : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNullabilitySameGenericType.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
index a09cfddba19..7860b5554ea 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritProjectionKind : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritProjectionKind.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/Number!>, kotlin/collections/List<kotlin/Number!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<ft<kotlin/Number, kotlin/Number?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/Number!>, kotlin/collections/Collection<kotlin/Number!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
index abfc4fba850..376e390a296 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritReadOnlinessOfArgument : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritReadOnlinessOfArgument.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
index 317527a984a..414c4792aad 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritReadOnlinessSameClass : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritReadOnlinessSameClass.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
index 8f078ecfefd..04c13e35a12 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritReadOnlinessSubclass : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritReadOnlinessSubclass.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
index a65aa162041..ee2a8202725 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface SameProjectionKind : R|kotlin/Any| {
     public abstract interface Sub : R|test/SameProjectionKind.Super| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<out ft<kotlin/Number, kotlin/Number?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out kotlin/Number!>, kotlin/collections/Collection<out kotlin/Number!>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<out ft<kotlin/Number, kotlin/Number?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out kotlin/Number!>, kotlin/collections/Collection<out kotlin/Number!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
index 0458ea29ed9..71d2b8f67d1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
@@ -1,18 +1,18 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
-    public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Generic<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<T & Any, T?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface NonGeneric : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+        public abstract fun foo(): R|kotlin/String!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
-        @R|java/lang/Override|() public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<kotlin/String!>| {
+        @R|java/lang/Override|() public abstract fun foo(): R|kotlin/String!|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
index 706dfea3fe4..44cf73571c4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableCollection<ft<E & Any, E?>>| {
+public abstract interface SubclassOfCollection<E : R|kotlin/Any!|> : R|kotlin/collections/MutableCollection<ft<E & Any, E?>>| {
     public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<ft<E & Any, E?>>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
index 54a0c7b0843..3bfde2cb823 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K & Any, K?>, ft<V & Any, V?>>| {
+public abstract interface SubclassOfMapEntry<K : R|kotlin/Any!|, V : R|kotlin/Any!|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K & Any, K?>, ft<V & Any, V?>>| {
     public abstract operator fun setValue(value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
index b6d7b955eb1..7fe74ec202f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
@@ -1,9 +1,9 @@
 public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<kotlin/String!>| {
+        public abstract fun foo(): R|kotlin/String!|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<T & Any, T?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
index b5c612146de..fba31e6fdf3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
@@ -1,15 +1,15 @@
 public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
-        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<kotlin/String!>|, R|test/SubstitutedClassParameters.Super2<kotlin/String!>| {
+        public abstract fun foo(): R|kotlin/String!|
 
     }
-    public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super1<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<T & Any, T?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
-    public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<E : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(): R|ft<E & Any, E?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
index 0bbe83b3c04..f4d7d2b2077 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesConflictingProjectionKinds : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclassesConflictingProjectionKinds.Super1|, R|test/TwoSuperclassesConflictingProjectionKinds.Super2| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/CharSequence!>, kotlin/collections/Collection<kotlin/CharSequence!>?>|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/CharSequence!>, kotlin/collections/Collection<kotlin/CharSequence!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/CharSequence!>, kotlin/collections/Collection<kotlin/CharSequence!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
index b76b0d9c6ec..baa0ba4a010 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesInvariantAndCovariantInferMutability : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclassesInvariantAndCovariantInferMutability.Super1|, R|test/TwoSuperclassesInvariantAndCovariantInferMutability.Super2| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
index 70421f4a078..00e249dd2d6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclassesInvariantAndCovariantInferNullability.Super1|, R|test/TwoSuperclassesInvariantAndCovariantInferNullability.Super2| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
index 650c9a23c8e..52c386eb9b5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesMutableAndNot : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclassesMutableAndNot.Super1|, R|test/TwoSuperclassesMutableAndNot.Super2| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
index 0c3cfbe28d5..be69c81b741 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
@@ -4,7 +4,7 @@ public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| {
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun foo(): R|kotlin/CharSequence!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
index fd994e09426..1ab13823fbd 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
@@ -4,7 +4,7 @@ public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| {
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun foo(): R|kotlin/CharSequence!|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
index 2679c0c5e5a..9febf87f1c6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclassesSupplementNotNull.Super1|, R|test/TwoSuperclassesSupplementNotNull.Super2| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
index 382c412cf2c..069bc172630 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
@@ -1,9 +1,9 @@
 public abstract interface TypeParamOfClass : R|kotlin/Any| {
-    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/TypeParamOfClass.Super<ft<T & Any, T?>>| {
+    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/TypeParamOfClass.Super<ft<T & Any, T?>>| {
         public abstract fun foo(): R|@EnhancedNullability T & Any|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T & Any|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
index b4aef940e43..fab3312bb17 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
@@ -1,9 +1,9 @@
 public abstract interface TypeParamOfClassSubstituted : R|kotlin/Any| {
-    public abstract interface Sub : R|test/TypeParamOfClassSubstituted.Super<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/TypeParamOfClassSubstituted.Super<kotlin/String!>| {
         public abstract fun foo(): R|@EnhancedNullability kotlin/String|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T & Any|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
index e59a760bcd7..18719fa3b9e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface TypeParamOfFun : R|kotlin/Any| {
     public abstract interface Sub : R|test/TypeParamOfFun.Super| {
-        public abstract fun <E : R|ft<kotlin/Any, kotlin/Any?>|> foo(): R|@EnhancedNullability E & Any|
+        public abstract fun <E : R|kotlin/Any!|> foo(): R|@EnhancedNullability E & Any|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        @R|org/jetbrains/annotations/NotNull|() public abstract fun <T : R|ft<kotlin/Any, kotlin/Any?>|> foo(): R|@EnhancedNullability T & Any|
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun <T : R|kotlin/Any!|> foo(): R|@EnhancedNullability T & Any|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
index a5b02c0979d..8235c92b707 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface InheritNullability : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNullability.Super| {
-        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
index 4c9f0aef364..44108a13f0b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface TwoBounds : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoBounds.Super| {
-        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|, R|kotlin/Cloneable!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
index 20e84c0721a..a1e70abbd5c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
@@ -1,14 +1,14 @@
 public abstract interface TwoSuperclasses : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| {
-        public abstract fun <C : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(c: R|ft<C & Any, C?>|): R|kotlin/Unit|
+        public abstract fun <C : R|kotlin/CharSequence!|> foo(c: R|ft<C & Any, C?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|> foo(a: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
index 88eaea489c3..138f56e6afa 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface TwoTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/TwoTypeParameters.Super| {
-        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, A : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/CharSequence!|, A : R|kotlin/Cloneable!|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/CharSequence!|, B : R|kotlin/Cloneable!|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
index 26154157a77..b0cf5262ba5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
@@ -1,12 +1,12 @@
 public abstract interface UseParameterAsUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| {
-        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<B & Any, B?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|ft<B & Any, B?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
-        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
index ba501ec6622..87ebaa41969 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface UseParameterInUpperBound : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBound.Super| {
-        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
index 955f9ea23bf..77437b1115c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| {
-        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
+        public abstract fun <B : R|kotlin/Any!|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+        public abstract fun <A : R|kotlin/Any!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
index 6a1c4015a52..dfadafdc099 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
 
     public abstract fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
index fef9713a391..93362e1db58 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface LoadIterator<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface LoadIterator<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public abstract fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T & Any, T?>>, kotlin/collections/Iterator<ft<T & Any, T?>>?>|
 
     public abstract fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T & Any, T?>>, kotlin/collections/Iterator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
index 5668af18df9..5c9ef202091 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open fun <T : R|ft<kotlin/Any, kotlin/Any?>|, R|ft<kotlin/Comparable<in ft<T & Any, T?>>, kotlin/Comparable<in ft<T & Any, T?>>?>|> max(coll: R|ft<kotlin/collections/MutableCollection<out ft<T & Any, T?>>, kotlin/collections/Collection<out ft<T & Any, T?>>?>|): R|ft<T & Any, T?>|
+    public open fun <T : R|kotlin/Any!|, R|ft<kotlin/Comparable<in ft<T & Any, T?>>, kotlin/Comparable<in ft<T & Any, T?>>?>|> max(coll: R|ft<kotlin/collections/MutableCollection<out ft<T & Any, T?>>, kotlin/collections/Collection<out ft<T & Any, T?>>?>|): R|ft<T & Any, T?>|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
index a5cf9efd5d1..89ac08e528b 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
@@ -1,4 +1,4 @@
-public open class ModalityOfFakeOverrides : R|java/util/AbstractList<ft<kotlin/String, kotlin/String?>>| {
+public open class ModalityOfFakeOverrides : R|java/util/AbstractList<kotlin/String!>| {
     @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|@EnhancedNullability kotlin/String|
 
     public constructor(): R|test/ModalityOfFakeOverrides|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
index 4004e2a7ae2..11ae023d962 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
     @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
 
     public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
index f5d5dcea3e0..cc197ba1b5e 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface LoadIterableWithConflict<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface LoadIterableWithConflict<T : R|kotlin/Any!|> : R|kotlin/Any| {
     @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|
 
     public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
index 896f46931e0..7a66753e270 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface LoadIterableWithNullability<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface LoadIterableWithNullability<T : R|kotlin/Any!|> : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T & Any, T?>>|
 
     public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T & Any, T?>>|): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
index 0c6d36d9d39..c0a8aeef4a7 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
@@ -1,5 +1,5 @@
 public abstract interface LoadIterableWithPropagation : R|kotlin/Any| {
-    public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface LoadIterable<T : R|kotlin/Any!|> : R|kotlin/Any| {
         @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
 
         public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
@@ -9,7 +9,7 @@ public abstract interface LoadIterableWithPropagation : R|kotlin/Any| {
         public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
     }
-    public open class LoadIterableImpl<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable<ft<T & Any, T?>>| {
+    public open class LoadIterableImpl<T : R|kotlin/Any!|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable<ft<T & Any, T?>>| {
         public open fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|
 
         public open fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T & Any, T?>>, kotlin/collections/MutableIterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
@@ -18,7 +18,7 @@ public abstract interface LoadIterableWithPropagation : R|kotlin/Any| {
 
         public open fun setReadOnlyIterable(Iterable: R|ft<kotlin/collections/Iterable<ft<T & Any, T?>>, kotlin/collections/Iterable<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
-        public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/LoadIterableWithPropagation.LoadIterableImpl<T>|
+        public constructor<T : R|kotlin/Any!|>(): R|test/LoadIterableWithPropagation.LoadIterableImpl<T>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
index 4e279e6c864..6bdc6e6cc2d 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| {
     public abstract fun bar(): R|kotlin/Unit|
 
-    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
+    public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out kotlin/CharSequence!>, kotlin/collections/List<out kotlin/CharSequence!>?>|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in kotlin/String!>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
index 88fc7046ad3..35316353162 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
@@ -1,5 +1,5 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, @EnhancedNullability kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>>|
+    @R|org/jetbrains/annotations/NotNull|() public open fun hi(): R|ft<@EnhancedNullability kotlin/Array<kotlin/Any!>, @EnhancedNullability kotlin/Array<out kotlin/Any!>>|
 
     public constructor(): R|test/NotNullObjectArray|
 
diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
index 5fe8611109e..804a0cb4af4 100644
--- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
@@ -13,58 +13,58 @@ public open class Rendering : R|kotlin/Any| {
         public/*package*/ test/Rendering.constructor(): R|test/Rendering.C_Sub|
 
     }
-    public/*package*/ open inner class D_SuperG<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public/*package*/ test/Rendering.constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/Rendering.D_SuperG<T>|
+    public/*package*/ open inner class D_SuperG<T : R|kotlin/Any!|> : R|kotlin/Any| {
+        public/*package*/ test/Rendering.constructor<T : R|kotlin/Any!|>(): R|test/Rendering.D_SuperG<T>|
 
     }
-    public/*package*/ open inner class E_SubG : R|test/Rendering.D_SuperG<ft<kotlin/String, kotlin/String?>>| {
+    public/*package*/ open inner class E_SubG : R|test/Rendering.D_SuperG<kotlin/String!>| {
         public/*package*/ test/Rendering.constructor(): R|test/Rendering.E_SubG|
 
     }
     public/*package*/ abstract interface F_Array : R|kotlin/Any| {
-        public abstract fun foo1(strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo1(strings: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo2(strings: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun foo2(strings: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
-        public abstract fun foo3(vararg args: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+        public abstract fun foo3(vararg args: R|ft<kotlin/Array<kotlin/Int!>, kotlin/Array<out kotlin/Int!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo4(vararg args: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo4(vararg args: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo5(vararg args: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+        public abstract fun foo5(vararg args: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|): R|kotlin/Unit|
 
     }
     public/*package*/ abstract interface G_Collections : R|kotlin/Any| {
-        public abstract fun foo1(x: R|ft<kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Iterator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo1(x: R|ft<kotlin/collections/MutableIterator<kotlin/String!>, kotlin/collections/Iterator<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo2(x: R|ft<kotlin/collections/MutableIterable<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Iterable<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo2(x: R|ft<kotlin/collections/MutableIterable<kotlin/String!>, kotlin/collections/Iterable<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo3(x: R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo3(x: R|ft<kotlin/collections/MutableCollection<kotlin/String!>, kotlin/collections/Collection<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo4(x: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo4(x: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo5(x: R|ft<kotlin/collections/MutableSet<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Set<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo5(x: R|ft<kotlin/collections/MutableSet<kotlin/String!>, kotlin/collections/Set<kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo6(x: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo6(x: R|ft<kotlin/collections/MutableMap<kotlin/String!, kotlin/String!>, kotlin/collections/Map<kotlin/String!, kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo7(x: R|ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo7(x: R|ft<kotlin/collections/MutableMap.MutableEntry<kotlin/String!, kotlin/String!>, kotlin/collections/Map.Entry<kotlin/String!, kotlin/String!>?>|): R|kotlin/Unit|
 
     }
     public/*package*/ abstract interface H_Raw : R|kotlin/Any| {
         public abstract fun foo1(x: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/Unit|
 
-        public abstract fun foo2(x: R|ft<test/Rendering.D_SuperG<ft<kotlin/Any, kotlin/Any?>>, test/Rendering.D_SuperG<*>?>|): R|kotlin/Unit|
+        public abstract fun foo2(x: R|ft<test/Rendering.D_SuperG<kotlin/Any!>, test/Rendering.D_SuperG<*>?>|): R|kotlin/Unit|
 
     }
     public/*package*/ abstract interface I_Wildcard : R|kotlin/Any| {
-        public abstract fun foo1(x: R|ft<kotlin/collections/MutableList<out ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo1(x: R|ft<kotlin/collections/MutableList<out kotlin/String!>, kotlin/collections/List<out kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo2(x: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>, kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo2(x: R|ft<kotlin/collections/MutableList<in kotlin/String!>, kotlin/collections/MutableList<in kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun foo3(x: R|ft<kotlin/collections/MutableList<*>, kotlin/collections/List<*>?>|): R|kotlin/Unit|
 
-        public abstract fun foo4(x: R|ft<test/Rendering.D_SuperG<out ft<kotlin/String, kotlin/String?>>, test/Rendering.D_SuperG<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo4(x: R|ft<test/Rendering.D_SuperG<out kotlin/String!>, test/Rendering.D_SuperG<out kotlin/String!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo5(x: R|ft<test/Rendering.D_SuperG<in ft<kotlin/String, kotlin/String?>>, test/Rendering.D_SuperG<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo5(x: R|ft<test/Rendering.D_SuperG<in kotlin/String!>, test/Rendering.D_SuperG<in kotlin/String!>?>|): R|kotlin/Unit|
 
         public abstract fun foo6(x: R|ft<test/Rendering.D_SuperG<*>, test/Rendering.D_SuperG<*>?>|): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
index 514b1ea5991..88b80b3cc4d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface Comparator<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public abstract interface Comparator<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public abstract fun compare(o1: R|ft<T & Any, T?>|, o2: R|ft<T & Any, T?>|): R|kotlin/Int|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
index f9f5ff95fad..1a997c69312 100644
--- a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
@@ -2,15 +2,15 @@ public final class DifferentParametersCount : R|kotlin/Any| {
     public constructor(): R|test/DifferentParametersCount|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|, y: R|kotlin/Int|): R|kotlin/Unit|
 
         public constructor(): R|test/DifferentParametersCount.A|
 
     }
     public open class B : R|test/DifferentParametersCount.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|, y: R|kotlin/Int|): R|kotlin/Unit|
 
         public constructor(): R|test/DifferentParametersCount.B|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
index b9a1e9f1a59..c2572e34023 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
@@ -2,15 +2,15 @@ public final class FakeStaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/FakeStaticOverrides|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/FakeStaticOverrides.A|
 
     }
     public open class B : R|test/FakeStaticOverrides.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/FakeStaticOverrides.B|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
index a01b29204b6..3effc9d9116 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface FilenameFilter : R|kotlin/Any| {
-    public abstract fun accept(dir: R|ft<java/io/File, java/io/File?>|, name: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Boolean|
+    public abstract fun accept(dir: R|java/io/File!|, name: R|kotlin/String!|): R|kotlin/Boolean|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
index 0234f232aa9..b1dcc13d19a 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A & Any, A?>>, kotlin/Comparable<ft<A & Any, A?>>?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> : R|kotlin/Any| {
+public abstract interface GenericInterfaceParametersWithBounds<A : R|ft<kotlin/Comparable<ft<A & Any, A?>>, kotlin/Comparable<ft<A & Any, A?>>?>|, R|kotlin/Cloneable!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> : R|kotlin/Any| {
     public abstract fun method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
index e7dccaa387e..262b69d88a1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public abstract fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<kotlin/Array<ft<A & Any, A?>>, kotlin/Array<out ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
index 4220afa6cc9..2546f72ad5d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
@@ -1,11 +1,11 @@
 public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| {
-    public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<kotlin/String!>| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun f(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+        public abstract fun f(): R|kotlin/CharSequence!|
 
     }
-    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun f(): R|ft<T & Any, T?>|
 
     }
diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
index 813dd324a87..d74db48bc80 100644
--- a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
@@ -2,15 +2,15 @@ public final class StaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/StaticOverrides|
 
     public open class A : R|kotlin/Any| {
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/StaticOverrides.A|
 
     }
     public open class B : R|test/StaticOverrides.A| {
-        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open static fun foo(x: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
         public constructor(): R|test/StaticOverrides.B|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
index 4e66cb644a9..b3a0995e426 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterface : R|java/util/Comparator<ft<kotlin/String, kotlin/String?>>| {
+public abstract interface SubstitutedSamInterface : R|java/util/Comparator<kotlin/String!>| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
index f7c72e12e6f..0c5260af74d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<ft<test/SubstitutedSamInterfaceSubclassOfBuiltin, test/SubstitutedSamInterfaceSubclassOfBuiltin?>>| {
+public abstract interface SubstitutedSamInterfaceSubclassOfBuiltin : R|kotlin/Comparable<test/SubstitutedSamInterfaceSubclassOfBuiltin!>| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
index 2bcfc72678f..187e13bd308 100644
--- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface VarargParameter : R|kotlin/Any| {
-    public abstract fun f(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public abstract fun f(vararg strings: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
index 75ab3c101fe..26ec388ba2b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
@@ -1,7 +1,7 @@
 public open class AmbiguousAdapters : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-    public open fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+    public open fun foo(c: R|java/io/Closeable!|): R|kotlin/Unit|
 
     public constructor(): R|test/AmbiguousAdapters|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
index 76ae3ae1fdf..7d99b560ae0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
@@ -1,7 +1,7 @@
 public open class Basic : R|kotlin/Any| {
-    public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-    public open static fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+    public open static fun bar(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     public constructor(): R|test/Basic|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
index b2365169db2..82869d82c54 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
@@ -1,4 +1,4 @@
 public open class Constructor : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|test/Constructor|
+    public constructor(r: R|java/lang/Runnable!|): R|test/Constructor|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
index 4b85d21a96c..35e01fe0929 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorWithAnnotations : R|kotlin/Any| {
-    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
+    public constructor(r: R|java/lang/Runnable!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
index f763a842a0b..ad52c93d21c 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface DeepSamLoop : R|kotlin/Any| {
     public abstract interface Bar : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<test/DeepSamLoop.Foo, test/DeepSamLoop.Foo?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|test/DeepSamLoop.Foo!|): R|kotlin/Unit|
 
     }
     public abstract interface Foo : R|kotlin/Any| {
-        public abstract fun foo(p: R|ft<test/DeepSamLoop.Bar, test/DeepSamLoop.Bar?>|): R|kotlin/Unit|
+        public abstract fun foo(p: R|test/DeepSamLoop.Bar!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
index 7009256b916..00abd9f9cb4 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
@@ -1,11 +1,11 @@
 public open class NonTrivialFunctionType : R|kotlin/Any| {
-    public open fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|): R|kotlin/Unit|
+    public open fun foo(filenameFilter: R|java/io/FilenameFilter!|): R|kotlin/Unit|
 
-    public open fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun foo(comparator: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|): R|kotlin/Unit|
 
     public open fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|): R|kotlin/Unit|
 
-    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>>, java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|): R|kotlin/Unit|
+    public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence!>, java/util/Comparator<in kotlin/CharSequence!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/NonTrivialFunctionType|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
index 496cd3477f9..99c9789b4da 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
@@ -1,5 +1,5 @@
 public open class PrivateSamAdapter : R|kotlin/Any| {
-    private open fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|): R|kotlin/Unit|
+    private open fun samAdapter(r: R|test/PrivateSamAdapter.SamInterface!|): R|kotlin/Unit|
 
     public constructor(): R|test/PrivateSamAdapter|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
index e07d9e2d362..d28098b763d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface SelfAsParameter : R|kotlin/Any| {
-    public abstract fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|): R|kotlin/Unit|
+    public abstract fun foo(p: R|test/SelfAsParameter!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
index c7d70a4703e..28f90730b9e 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
@@ -1,5 +1,5 @@
 public open class SeveralSamParameters : R|kotlin/Any| {
-    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|, a: R|ft<kotlin/String, kotlin/String?>|, b: R|ft<kotlin/String, kotlin/String?>|, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|ft<kotlin/String, kotlin/String?>|
+    public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|, a: R|kotlin/String!|, b: R|kotlin/String!|, afterRunnable: R|java/lang/Runnable!|): R|kotlin/String!|
 
     public constructor(): R|test/SeveralSamParameters|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
index 22dc1e4c141..9503225c223 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
@@ -1,6 +1,6 @@
-public open class TypeParameterOfClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+public open class TypeParameterOfClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
     public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfClass<T>|
+    public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfClass<T>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
index dd420b15796..bb17c9d1b42 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
-    public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>|> max(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/Any!|> max(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
 
-    public open static fun <T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> max2(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
+    public open static fun <T : R|kotlin/CharSequence!|> max2(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|, value1: R|ft<T & Any, T?>|, value2: R|ft<T & Any, T?>|): R|ft<T & Any, T?>|
 
-    public open static fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<java/util/Comparator<ft<A & Any, A?>>, java/util/Comparator<ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
+    public open static fun <A : R|kotlin/CharSequence!|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> method(a: R|ft<java/util/Comparator<ft<A & Any, A?>>, java/util/Comparator<ft<A & Any, A?>>?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
index dde7ffe5107..2ebb843823f 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
@@ -1,7 +1,7 @@
-public open class TypeParameterOfOuterClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-    public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfOuterClass<T>|
+public open class TypeParameterOfOuterClass<T : R|kotlin/Any!|> : R|kotlin/Any| {
+    public constructor<T : R|kotlin/Any!|>(): R|test/TypeParameterOfOuterClass<T>|
 
-    public open inner class Inner<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public open inner class Inner<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public open fun foo(comparator: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
         public test/TypeParameterOfOuterClass<T>.constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
index 66aa06d1dd6..a29cd9fe764 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
@@ -1,12 +1,12 @@
 public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| {
     public abstract interface Sub : R|test/AdapterDoesntOverrideDeclaration.Super| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
index 2e2e55392fb..4773ff46e23 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
@@ -2,9 +2,9 @@ public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAdapterAndDeclaration.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
index aa80348d59f..26b1f11604e 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
@@ -2,9 +2,9 @@ public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAmbiguousAdapters.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
index ffc925e91b5..817e0a46ed2 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
@@ -1,14 +1,14 @@
 public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedAndOverriddenAmbiguousAdapters.Super| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
index 9ec8b0484ce..a6776eb2d5e 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
@@ -1,12 +1,12 @@
 public abstract interface InheritedOverridden : R|kotlin/Any| {
     public open class Sub : R|test/InheritedOverridden.Super| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverridden.Sub|
 
     }
     public open class Super : R|kotlin/Any| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverridden.Super|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
index 907a58c7b16..3d4225dd336 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
@@ -1,14 +1,14 @@
 public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| {
     public open class Sub : R|test/InheritedOverriddenAdapter.Super| {
-        public open fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public open fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverriddenAdapter.Sub|
 
     }
     public open class Super : R|kotlin/Any| {
-        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
         public constructor(): R|test/InheritedOverriddenAdapter.Super|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
index 3ec92a0bf78..571e476cb68 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
@@ -2,11 +2,11 @@ public abstract interface InheritedSameAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedSameAdapters.Super1|, R|test/InheritedSameAdapters.Super2| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
index e21cec43e17..c9638a12697 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
@@ -2,13 +2,13 @@ public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any|
     public abstract interface Sub : R|test/InheritedSameAdaptersWithSubstitution.Super1|, R|test/InheritedSameAdaptersWithSubstitution.Super2Substituted| {
     }
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(r: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
 
     }
-    public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<ft<kotlin/String, kotlin/String?>>| {
+    public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<kotlin/String!>| {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
index 8a29f2c0c12..e07364542a1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
@@ -2,7 +2,7 @@ public abstract interface InheritedSimple : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritedSimple.Super| {
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
index 382f94b20a3..e7200e6d58b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| {
     public abstract interface Sub : R|test/OverriddenAmbiguousAdapters.Super| {
-        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
 
-        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+        public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
index 97fcff24930..ac04e3a66f9 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
@@ -1,18 +1,18 @@
 public abstract interface ArraysInSubtypes : R|kotlin/Any| {
-    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ArraysInSubtypes.Super| {
-        public abstract fun array(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+    public abstract interface Sub<T : R|kotlin/Any!|> : R|test/ArraysInSubtypes.Super| {
+        public abstract fun array(): R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|
 
-        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/collections/List<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|
 
         public abstract fun objArray(): R|ft<kotlin/Array<ft<T & Any, T?>>, kotlin/Array<out ft<T & Any, T?>>?>|
 
     }
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun array(): R|ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+        public abstract fun array(): R|ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>|
 
-        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>, kotlin/collections/List<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>?>|
+        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>, kotlin/collections/List<out ft<kotlin/Array<kotlin/CharSequence!>, kotlin/Array<out kotlin/CharSequence!>?>>?>|
 
-        public abstract fun objArray(): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|
+        public abstract fun objArray(): R|ft<kotlin/Array<kotlin/Any!>, kotlin/Array<out kotlin/Any!>?>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
index 0b02a2e0b5b..50485d8c196 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface MethodTypeParameterErased : R|kotlin/Any| {
-    public abstract interface Bug<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Bug<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun <RET : R|ft<test/MethodTypeParameterErased.Bug<ft<T & Any, T?>>, test/MethodTypeParameterErased.Bug<ft<T & Any, T?>>?>|> save(): R|ft<RET & Any, RET?>|
 
     }
-    public open class SubBug : R|kotlin/Any|, R|test/MethodTypeParameterErased.Bug<ft<kotlin/Any, kotlin/Any?>>| {
-        public open fun save(): R|ft<test/MethodTypeParameterErased.SubBug, test/MethodTypeParameterErased.SubBug?>|
+    public open class SubBug : R|kotlin/Any|, R|test/MethodTypeParameterErased.Bug<kotlin/Any!>| {
+        public open fun save(): R|test/MethodTypeParameterErased.SubBug!|
 
         public constructor(): R|test/MethodTypeParameterErased.SubBug|
 
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
index 0e67bd8eb36..1c353332a78 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
@@ -1,15 +1,15 @@
 public open class RawSuperType : R|kotlin/Any| {
     public constructor(): R|test/RawSuperType|
 
-    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperType.Super<ft<kotlin/Any, kotlin/Any?>>| {
-        @R|java/lang/Override|() public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperType.Super<kotlin/Any!>| {
+        @R|java/lang/Override|() public open fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
 
         @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
 
         public test/RawSuperType.constructor(): R|test/RawSuperType.Derived|
 
     }
-    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|kotlin/Any!|> : R|kotlin/Any| {
         public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
index 5c6fe84f78b..d80908906c3 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
@@ -3,17 +3,17 @@ public open class RawSuperTypeWithBound : R|kotlin/Any| {
 
     public abstract interface Bound : R|kotlin/Any| {
     }
-    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithBound.Super<ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>>| {
-        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithBound.Super<test/RawSuperTypeWithBound.Bound!>| {
+        public open fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
 
-        @R|java/lang/Override|() public open fun foo(o: R|ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>|): R|kotlin/Unit|
+        @R|java/lang/Override|() public open fun foo(o: R|test/RawSuperTypeWithBound.Bound!|): R|kotlin/Unit|
 
         @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
 
         public test/RawSuperTypeWithBound.constructor(): R|test/RawSuperTypeWithBound.Derived|
 
     }
-    public abstract interface Super<T : R|ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>|> : R|kotlin/Any| {
+    public abstract interface Super<T : R|test/RawSuperTypeWithBound.Bound!|> : R|kotlin/Any| {
         public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
index a70eca8899d..53aef86fe52 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
@@ -2,7 +2,7 @@ public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| {
     public constructor(): R|test/RawSuperTypeWithRecursiveBound|
 
     public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithRecursiveBound.Super<ft<test/RawSuperTypeWithRecursiveBound.Super<*>, test/RawSuperTypeWithRecursiveBound.Super<*>?>>| {
-        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+        public open fun foo(o: R|kotlin/Any!|): R|kotlin/Unit|
 
         @R|java/lang/Override|() public open fun foo(o: R|ft<test/RawSuperTypeWithRecursiveBound.Super<ft<test/RawSuperTypeWithRecursiveBound.Super<*>, test/RawSuperTypeWithRecursiveBound.Super<*>?>>, test/RawSuperTypeWithRecursiveBound.Super<*>?>|): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
index c9c32123250..928c7e10f64 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
@@ -1,17 +1,17 @@
 public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/Any| {
     public constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters|
 
-    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<kotlin/Any, kotlin/Any?>, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>| {
-        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|, o1: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<kotlin/Any!, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>| {
+        public open fun foo(o: R|kotlin/Any!|, o1: R|kotlin/Any!|): R|kotlin/Unit|
 
-        @R|java/lang/Override|() public open fun foo(r: R|ft<kotlin/Any, kotlin/Any?>|, t: R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<kotlin/Any, kotlin/Any?>, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>|): R|kotlin/Unit|
+        @R|java/lang/Override|() public open fun foo(r: R|kotlin/Any!|, t: R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<kotlin/Any!, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>|): R|kotlin/Unit|
 
         @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
 
         public test/RawSuperTypeWithRecursiveBoundMultipleParameters.constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Derived|
 
     }
-    public abstract interface Super<R : R|ft<kotlin/Any, kotlin/Any?>|, T : R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>?>|> : R|kotlin/Any| {
+    public abstract interface Super<R : R|kotlin/Any!|, T : R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R & Any, R?>, ft<T & Any, T?>>?>|> : R|kotlin/Any| {
         public abstract fun foo(r: R|ft<R & Any, R?>|, t: R|ft<T & Any, T?>|): R|kotlin/Unit|
 
         public abstract fun dummy(): R|kotlin/Unit|
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
index 84b16118229..208f2c4c8b3 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
@@ -1,18 +1,18 @@
 public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
-    public open class Sub<B : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ReturnInnerSubclassOfSupersInner.Super<ft<B & Any, B?>>| {
-        public constructor<B : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub<B>|
+    public open class Sub<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super<ft<B & Any, B?>>| {
+        public constructor<B : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub<B>|
 
-        public/*package*/ open inner class Inner<B : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B & Any, B?>>| {
+        public/*package*/ open inner class Inner<B : R|kotlin/Any!|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B & Any, B?>>| {
             public/*package*/ open operator fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>, test/ReturnInnerSubclassOfSupersInner.Sub<ft<B & Any, B?>>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Sub<B>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Sub.Inner<B>|
 
         }
     }
-    public open class Super<A : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
-        public constructor<A : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ReturnInnerSubclassOfSupersInner.Super<A>|
+    public open class Super<A : R|kotlin/Any!|> : R|kotlin/Any| {
+        public constructor<A : R|kotlin/Any!|>(): R|test/ReturnInnerSubclassOfSupersInner.Super<A>|
 
-        public/*package*/ open inner class Inner<A : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public/*package*/ open inner class Inner<A : R|kotlin/Any!|> : R|kotlin/Any| {
             public/*package*/ open operator fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>, test/ReturnInnerSubclassOfSupersInner.Super<ft<A & Any, A?>>?>|
 
             public/*package*/ test/ReturnInnerSubclassOfSupersInner.Super<A>.constructor(): R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<A>|
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
index 6c6a7701fc2..cc0663303a9 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
@@ -1,18 +1,18 @@
 public abstract interface SubclassWithRawType : R|kotlin/Any| {
     public abstract interface Sub : R|test/SubclassWithRawType.Super| {
-        public abstract fun simple1(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun simple1(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
-        public abstract fun simple2(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun simple2(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun simple3(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
 
-        public abstract fun boundWildcard1(): R|ft<kotlin/collections/MutableList<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun boundWildcard1(): R|ft<kotlin/collections/MutableList<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/List<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun boundWildcard2(): R|ft<kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
 
         public abstract fun wildcard(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
 
-        public abstract fun array1(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun array1(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun array2(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
 
@@ -22,17 +22,17 @@ public abstract interface SubclassWithRawType : R|kotlin/Any| {
 
         public abstract fun simple2(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
 
-        public abstract fun simple3(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun simple3(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun boundWildcard1(): R|ft<kotlin/collections/MutableList<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/collections/List<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
 
-        public abstract fun boundWildcard2(): R|ft<kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun boundWildcard2(): R|ft<kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
         public abstract fun wildcard(): R|ft<kotlin/collections/MutableList<*>, kotlin/collections/List<*>?>|
 
         public abstract fun array1(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
 
-        public abstract fun array2(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+        public abstract fun array2(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>>?>|
 
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
index 87e02a0965d..c6b7ddaec38 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
@@ -1,16 +1,16 @@
 public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| {
-    public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+    public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
     public abstract fun dummy(): R|kotlin/Unit|
 
     public abstract interface Other : R|kotlin/Any| {
-        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public abstract fun dummy(): R|kotlin/Unit|
 
     }
     public open class Sub : R|kotlin/Any|, R|test/TwoSuperclassesInconsistentGenericTypes|, R|test/TwoSuperclassesInconsistentGenericTypes.Other| {
-        public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+        public open fun foo(): R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|
 
         public open fun dummy(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
index b15d6f71c8d..d76aaed88a8 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
@@ -1,4 +1,4 @@
-public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>>| {
+public final enum class Enum : R|kotlin/Enum<test/Enum!>| {
     public final static enum entry A: R|@EnhancedNullability test/Enum|
     public final static enum entry B: R|@EnhancedNullability test/Enum|
     public final static enum entry C: R|@EnhancedNullability test/Enum|
@@ -11,7 +11,7 @@ public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>>| {
     public open inner class Inner : R|kotlin/Any| {
         public/*package*/ open fun bar(): R|kotlin/Unit|
 
-        public/*package*/ open fun valueOf(s: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+        public/*package*/ open fun valueOf(s: R|kotlin/String!|): R|kotlin/Unit|
 
         public test/Enum.constructor(): R|test/Enum.Inner|
 
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
index 2e16b4189bb..36414160668 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
@@ -1,15 +1,15 @@
 public open class StaticFinal : R|kotlin/Any| {
     public final static field publicNonNull: R|kotlin/String| = String(aaa)
 
-    public final static field publicNull: R|ft<kotlin/String, kotlin/String?>|
+    public final static field publicNull: R|kotlin/String!|
 
     public/*package*/ final static field packageNonNull: R|kotlin/String| = String(bbb)
 
-    public/*package*/ final static field packageNull: R|ft<kotlin/String, kotlin/String?>|
+    public/*package*/ final static field packageNull: R|kotlin/String!|
 
     private final static field privateNonNull: R|kotlin/String| = String(bbb)
 
-    private final static field privateNull: R|ft<kotlin/String, kotlin/String?>|
+    private final static field privateNull: R|kotlin/String!|
 
     public constructor(): R|test/StaticFinal|
 
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
index 5fd88af474e..ffed59b1eef 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
@@ -1,8 +1,8 @@
-public final enum class StaticMembersInEnum : R|kotlin/Enum<ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>>| {
+public final enum class StaticMembersInEnum : R|kotlin/Enum<test/StaticMembersInEnum!>| {
     public final static enum entry ENTRY: R|@EnhancedNullability test/StaticMembersInEnum|
     public open static field STATIC_FIELD: R|kotlin/Int|
 
-    public final static field CONSTANT: R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|
+    public final static field CONSTANT: R|test/StaticMembersInEnum!|
 
     public open static fun foo(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
index b9bbdb79ab8..b4f7942fd69 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
@@ -1,5 +1,5 @@
 public open class VarargInt : R|kotlin/Any| {
-    public open fun vararg(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+    public open fun vararg(vararg p: R|kotlin/IntArray!|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargInt|
 
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
index e9b8a2e76fd..5718083aaa6 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
@@ -1,5 +1,5 @@
 public open class VarargString : R|kotlin/Any| {
-    public open fun vararg(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+    public open fun vararg(vararg strings: R|ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargString|