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 228f10afee2..ae7bef7b86d 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
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir.types
 
 fun ConeKotlinType.render(): String {
+    val nullabilitySuffix = if (this !is ConeKotlinErrorType && this !is ConeClassErrorType) nullability.suffix else ""
     return when (this) {
         is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})"
         is ConeDefinitelyNotNullType -> "${original.render()}!"
@@ -33,12 +34,10 @@ fun ConeKotlinType.render(): String {
             buildString {
                 append("ft<")
                 append(lowerBound.render())
-                append(lowerBound.nullability.suffix)
                 append(", ")
                 append(upperBound.render())
-                append(upperBound.nullability.suffix)
                 append(">")
             }
         }
-    }
+    } + nullabilitySuffix
 }
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index fe32e46f50d..3fa5d79edd5 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -1,5 +1,5 @@
 public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -55,7 +55,7 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges/ClosedRange<kotlin/Char>| {
     public open operator fun contains(value: R|kotlin/Char|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -95,7 +95,7 @@ public abstract interface ClosedRange<T> : R|kotlin/Any| {
 }
 
 public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -151,7 +151,7 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/ClosedRange<kotlin/Int>| {
     public open operator fun contains(value: R|kotlin/Int|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -178,7 +178,7 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 }
 
 public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -234,7 +234,7 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges/ClosedRange<kotlin/Long>| {
     public open operator fun contains(value: R|kotlin/Long|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin.txt b/compiler/fir/resolve/testData/builtIns/kotlin.txt
index e62b253c5cb..1a85c03c397 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin.txt
@@ -24,15 +24,15 @@ public final fun longArrayOf(vararg elements: R|kotlin/LongArray|): R|kotlin/Lon
 
 public final fun shortArrayOf(vararg elements: R|kotlin/ShortArray|): R|kotlin/ShortArray|
 
-public final operator fun R|kotlin/String|?.plus(other: R|kotlin/Any|?): R|kotlin/String|
+public final operator fun R|kotlin/String?|.plus(other: R|kotlin/Any?|): R|kotlin/String|
 
-public final fun R|kotlin/Any|?.toString(): R|kotlin/String|
+public final fun R|kotlin/Any?|.toString(): R|kotlin/String|
 
 public abstract interface Annotation : R|kotlin/Any| {
 }
 
 public open class Any {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -533,7 +533,7 @@ public abstract class Enum<E> : R|kotlin/Comparable<E>| {
 
     public final operator fun compareTo(other: R|E|): R|kotlin/Int|
 
-    public final operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public final operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public final fun hashCode(): R|kotlin/Int|
 
@@ -1254,7 +1254,7 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/Char|
 
-    public final operator fun plus(other: R|kotlin/Any|?): R|kotlin/String|
+    public final operator fun plus(other: R|kotlin/Any?|): R|kotlin/String|
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
@@ -1279,19 +1279,19 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 }
 
 public open class Throwable : R|kotlin/Any| {
-    public open val cause: R|kotlin/Throwable|?
-        public get(): R|kotlin/Throwable|?
+    public open val cause: R|kotlin/Throwable?|
+        public get(): R|kotlin/Throwable?|
 
-    public open val message: R|kotlin/String|?
-        public get(): R|kotlin/String|?
+    public open val message: R|kotlin/String?|
+        public get(): R|kotlin/String?|
 
-    public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
+    public constructor(message: R|kotlin/String?|): R|kotlin/Throwable|
 
-    public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
+    public constructor(cause: R|kotlin/Throwable?|): R|kotlin/Throwable|
 
     public constructor(): R|kotlin/Throwable|
 
-    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
+    public constructor(message: R|kotlin/String?|, cause: R|kotlin/Throwable?|): R|kotlin/Throwable|
 
 }
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
index fe111d7c82c..07d671d6c96 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
@@ -1,9 +1,9 @@
 @R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|kotlin/Annotation| {
 }
 public open class NonNullNever : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open field field: R|kotlin/String?|
 
-    @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(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/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
index 916420106d3..ddbba9a3d48 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
@@ -1,7 +1,7 @@
 public open class Simple : R|kotlin/Any| {
-    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
index e4956c5d065..08738fbd870 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
@@ -1,7 +1,7 @@
 public open class Strange : R|kotlin/Any| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>|!
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open field field: R|ft<kotlin/String, kotlin/String?>!|
 
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence?|): R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
index fb81de8dd31..2ad549c8ae6 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
+++ b/compiler/fir/resolve/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|kotlin/String|?
+    public open field field: R|kotlin/String?|
 
     @R|javax/annotation/Nonnull|() public open field nonNullField: R|kotlin/String|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
index 86c90c790e6..c3da2077642 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
@@ -1,7 +1,7 @@
 @R|spr/NonNullApi|() public open class A : R|kotlin/Any| {
-    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
-    @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
+    @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
index 000e9ee06e2..49bda0177fd 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
@@ -5,7 +5,7 @@
 
     public open operator fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
index 7bd54396c9f..be82736094e 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
@@ -5,9 +5,9 @@
 
     public open operator fun foo3(x: R|kotlin/String|): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
@@ -21,9 +21,9 @@
 
     public abstract operator fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence|
 
-    @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
-    @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/CharSequence?|
 
     public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence|
 
@@ -33,7 +33,7 @@
 
     @R|javax/annotation/Nonnull|() public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
@@ -45,9 +45,9 @@
 
     public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String?|): R|kotlin/String?|
 
-    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String?|): R|kotlin/String?|
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index 17fb8daa9e6..632390fcad7 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -1,13 +1,13 @@
 @R|NonNullApi|() public open class A : R|kotlin/Any| {
     public open field field: R|kotlin/String|
 
-    public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
-    @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String|?, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String|?
+    @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String?|, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String?|
 
     public open operator fun bar(): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator 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 operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
index b062f4511ae..68e4c58b76f 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
+++ b/compiler/fir/resolve/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|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
index d9ff9d5f1e0..fd9502c71c9 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
+++ b/compiler/fir/resolve/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|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
@@ -9,9 +9,9 @@ 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|?
+    @R|javax/annotation/Nullable|() public open field field: R|kotlin/String?|
 
-    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>!|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
index 86f54f3ce10..631560e9785 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
+++ b/compiler/fir/resolve/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|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String|
 
     public open operator fun bar(): R|kotlin/String|
 
-    @R|spr/Nullable|() public open operator 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 operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
index 28143c27686..f08b20fb5d2 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
+++ b/compiler/fir/resolve/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|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>!|, @R|spr/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun bar(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun bar(): R|ft<kotlin/String, kotlin/String?>!|
 
-    @R|spr/Nullable|() public open operator 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 operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>?|
 
     public constructor(): R|test/A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
index 8ebba71bc98..6cfb1381d47 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
@@ -1,24 +1,24 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>|! = R|/Signs.HELLO|): R|ft<Signs, Signs?>|!
+    public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>!| = R|/Signs.HELLO|): R|ft<Signs, Signs?>!|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>|! = R|/Signs.X|): R|ft<Signs, Signs?>|!
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>!| = R|/Signs.X|): R|ft<Signs, Signs?>!|
 
-    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>|!): R|ft<Signs, Signs?>|!
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>!|): R|ft<Signs, Signs?>!|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>!| = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>!|
 
     public/*package*/ constructor(): R|A|
 
 }
 public final enum class Mixed : R|kotlin/Enum<Mixed>| {
-    public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
+    public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>!|
 
 }
 public final enum class Signs : R|kotlin/Enum<Signs>| {
-    public final static field HELLO: R|ft<Signs, Signs?>|!
+    public final static field HELLO: R|ft<Signs, Signs?>!|
 
-    public final static field WORLD: R|ft<Signs, Signs?>|!
+    public final static field WORLD: R|ft<Signs, Signs?>!|
 
-    public final static field X: R|ft<Signs, Signs?>|!
+    public final static field X: R|ft<Signs, Signs?>!|
 
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
index 8224d5981e8..1dc001ea5d5 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
@@ -1,23 +1,23 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(31)): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
-    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>!| = Long(10)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public open class B : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
-    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>!|): R|kotlin/Unit|
 
     public constructor(): R|B|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
index 42cc2857842..1266af14ecd 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
@@ -7,7 +7,7 @@ public open class A : R|kotlin/Any| {
 
 }
 public open class B<T> : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>!| = Null(null)): R|kotlin/Unit|
 
     public constructor<T>(): R|B<T>|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
index 7c6d37193ac..af6a7d6c470 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
@@ -1,27 +1,27 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
-    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|A|
 
 }
 public abstract interface AInt : R|kotlin/Any| {
-    public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>!| = Null(null)): R|kotlin/Unit|
 
 }
 public open class B : R|A| {
-    public open operator fun foo(i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun foo(i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
-    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
-    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>!| = Int(42)): R|kotlin/Unit|
 
     public constructor(): R|B|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
index 32bcffa4669..ad9eb462d8e 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
@@ -1,13 +1,13 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>|! = String(hello)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>!| = String(hello)): R|kotlin/Unit|
 
-    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), b: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>!| = String(first), b: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun fourth(first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun fourth(first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>!| = String(second)): R|kotlin/Unit|
 
-    public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
index f4efef0075a..9f7e2df6c14 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
@@ -1,9 +1,9 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
index 86506d19fab..75e1734a516 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
index 5cba14860fe..73d6f566143 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
@@ -1,5 +1,5 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>!|, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
index 88a82eed62d..c276fd97847 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
-    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
index 9b79792ccbc..1a219ed2ff7 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class A : R|kotlin/Any| {
-    public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
+    public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>!| = String(OK)): R|ft<kotlin/String, kotlin/String?>!|
 
     public/*package*/ constructor(): R|A|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
index 98b1e9802b9..bebbcbecfc8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
@@ -29,7 +29,7 @@ public final class Test : R|kotlin/Any| {
 }
 
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
index fa9347e7665..76349b9c3a5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
@@ -1,5 +1,5 @@
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
index f23b7952e41..83c3832fb68 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
@@ -3,7 +3,7 @@ public final data class My : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/Int| = STUB): R|test/My|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
index 039cc27cdba..37b7156fc39 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
@@ -12,7 +12,7 @@ public final class Class : R|kotlin/Any| {
 }
 
 public final class CustomDelegate : R|kotlin/Any| {
-    public final operator fun getValue(thisRef: R|kotlin/Any|?, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
+    public final operator fun getValue(thisRef: R|kotlin/Any?|, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
 
     public constructor(): R|test/CustomDelegate|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
index b5d1c6f8536..08a2afdeab7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -1,4 +1,4 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
-    private constructor(list: R|kotlin/collections/List<kotlin/String>|?): R|test/EnumWithGenericConstructorParameter|
+    private constructor(list: R|kotlin/collections/List<kotlin/String>?|): R|test/EnumWithGenericConstructorParameter|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
index 70daa1c1570..87451ce2f50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
@@ -1,7 +1,7 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
     public open fun getSomething(): R|kotlin/Int|
 
-    public open fun setSomething(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setSomething(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/DifferentGetterAndSetter|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
index 1a0b515752d..2e5a94e886c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
@@ -1,5 +1,5 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|?
+    public open fun getColor(): R|kotlin/String?|
 
     public constructor(): R|test/JavaBeanVal|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
index 0d3755c5a98..c871d833c45 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|?
+    public open fun getColor(): R|kotlin/String?|
 
-    public open fun setColor(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setColor(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/JavaBeanVar|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
index efed0eab0b8..b76b24832df 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P> : R|kotlin/Any| {
-    public open fun getCharacters(): R|java/util/ArrayList<P>|?
+    public open fun getCharacters(): R|java/util/ArrayList<P>?|
 
-    public open fun setCharacters(p0: R|java/util/ArrayList<P>|?): R|kotlin/Unit|
+    public open fun setCharacters(p0: R|java/util/ArrayList<P>?|): R|kotlin/Unit|
 
     public constructor<P>(): R|test/JavaBeanVarOfGenericType<P>|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
index 89fa2c0392e..06fa9a4e721 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
@@ -1,7 +1,7 @@
 public open class TwoSetters : R|kotlin/Any| {
     public open fun setSize(p0: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open fun setSize(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun setSize(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/TwoSetters|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
index c6ac6997285..c15f8792473 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
-    public constructor(p0: R|java/lang/Class<kotlin/Any>|?): R|test/ConstructorGenericDeep|
+    public constructor(p0: R|java/lang/Class<kotlin/Any?>?|): R|test/ConstructorGenericDeep|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
index 1992ab406a7..ab166495f6e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/Any|?): R|test/ConstructorGenericSimple|
+    public constructor(p0: R|kotlin/Any?|): R|test/ConstructorGenericSimple|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
index dbc7b9a47fa..e092a209428 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor(p0: R|java/util/RandomAccess|?): R|test/ConstructorGenericUpperBound|
+    public constructor(p0: R|java/util/RandomAccess?|): R|test/ConstructorGenericUpperBound|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
index dd4f809700f..5e6e044822f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, z: R|kotlin/Double| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
index 39d36a30c5d..c16b9ac0d50 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
@@ -3,7 +3,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
index 1ebe715c76e..b7adf067c86 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, y: R|kotlin/Int| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
index 19f75c187d6..3f2493721a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
@@ -5,7 +5,7 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String| = STUB, y: R|kotlin/Int| = STUB): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
index 14884d3fdca..5d545c12828 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
@@ -1,5 +1,5 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>|?): R|kotlin/Array<kotlin/Any>|?
+    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>?|): R|kotlin/Array<kotlin/Any>?|
 
     public constructor(): R|test/ArrayTypeVariance|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
index d47f9e5f478..110200d7844 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|kotlin/collections/Iterable<P>|?, P> : R|kotlin/Any| {
-    public constructor<R : R|kotlin/collections/Iterable<P>|?, P>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|kotlin/collections/Iterable<P>?|, P> : R|kotlin/Any| {
+    public constructor<R : R|kotlin/collections/Iterable<P>?|, P>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
index 4b0d7957240..9ca97119335 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|?> : R|kotlin/Any| {
-    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|?>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>?|> : R|kotlin/Any| {
+    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>?|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
index e81c2f1dc6b..1dfeb2f1bcf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
@@ -1,7 +1,7 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
-    public final var files: R|kotlin/Array<java/io/File>|?
-        public get(): R|kotlin/Array<java/io/File>|?
-        public set(value: R|kotlin/Array<java/io/File>|?): kotlin/Unit
+    public final var files: R|kotlin/Array<java/io/File>?|
+        public get(): R|kotlin/Array<java/io/File>?|
+        public set(value: R|kotlin/Array<java/io/File>?|): kotlin/Unit
 
     public constructor(): R|test/FieldOfArrayType|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
index de504112b20..81a46d7eaaa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
@@ -5,16 +5,16 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
     }
 
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/String|?
+        public abstract fun bar(): R|kotlin/String?|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/CharSequence|?
+        public abstract fun bar(): R|kotlin/CharSequence?|
 
-        public abstract fun foo(): R|kotlin/String|?
+        public abstract fun foo(): R|kotlin/String?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
index c82394bb866..24628204400 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open fun <T : R|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/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
index de1f9c7b1f1..b506065ccaf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Cloneable|?, R|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/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
index 83ae2e7b474..dddc090cdc8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
@@ -1,4 +1,4 @@
 public open class MyException : R|kotlin/Any| {
-    public constructor(p0: R|kotlin/String|?, p1: R|kotlin/Throwable|?): R|test/MyException|
+    public constructor(p0: R|kotlin/String?|, p1: R|kotlin/Throwable?|): R|test/MyException|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
index 69e64df39ff..05760cb9845 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence>|?): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence?>?|): R|kotlin/Unit|
 
-    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence>|?): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence?>?|): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
index 5fec858f3a4..893fb5a2bfa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
@@ -1,9 +1,9 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final fun foo(): R|test/UnboundWildcard.MyClass<*>|?
+    public final fun foo(): R|test/UnboundWildcard.MyClass<*>?|
 
     public constructor(): R|test/UnboundWildcard|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence|?> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
index 1067e3b9add..91f4fd83246 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,5 +1,5 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|kotlin/Function1<kotlin/String, kotlin/String>|): @R|kotlin/ExtensionFunctionType|() R|kotlin/Function1<kotlin/String, kotlin/String>|?
+    public open fun foo(f: R|kotlin/Function1<kotlin/String?, kotlin/String>|): @R|kotlin/ExtensionFunctionType|() R|kotlin/Function1<kotlin/String, kotlin/String?>?|
 
     public constructor(): R|test/MethodWithFunctionTypes|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
index b51b27f099c..4b0ce657829 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
@@ -1,5 +1,5 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
-    public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
+    public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String?, kotlin/String>?>|): R|kotlin/String|
 
     public constructor(): R|test/MethodWithGenerics|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
index 32f8096611d..98131d96f2e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/List<kotlin/Cloneable>|> foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/List<kotlin/Cloneable>|> foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String?>|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
index ff40f128fab..6e3854ebf30 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
@@ -3,9 +3,9 @@ public open class PropertySimpleType : R|kotlin/Any| {
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
 
-    public final var fieldTwo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var fieldTwo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/PropertySimpleType|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
index eab0f2b2f66..44808da8975 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
@@ -3,7 +3,7 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence|?> : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
index 03e03b2ca2f..3d7e0c2e70b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -1,5 +1,5 @@
 public open class ConflictingProjectionKind : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>|?): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>?|): R|kotlin/Unit|
 
     public constructor(): R|test/ConflictingProjectionKind|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index ab3a10dc44c..ca79d9ed8a2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,7 +1,7 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/ExplicitFieldGettersAndSetters|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
index 2725d4030e7..0b26d21445c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,5 +1,5 @@
 public open class ExtraUpperBound : R|kotlin/Any| {
-    public open fun <A : R|java/lang/Runnable|?> foo(): R|kotlin/String|?
+    public open fun <A : R|java/lang/Runnable?|> foo(): R|kotlin/String?|
 
     public constructor(): R|test/ExtraUpperBound|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
index b14952be290..6b3a7be8a34 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
@@ -1,5 +1,5 @@
 public open class MissingUpperBound : R|kotlin/Any| {
-    public open fun <A : R|java/lang/Runnable|?, R|kotlin/Cloneable|?> foo(): R|kotlin/String|?
+    public open fun <A : R|java/lang/Runnable?|, R|kotlin/Cloneable?|> foo(): R|kotlin/String?|
 
     public constructor(): R|test/MissingUpperBound|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
index 6ceee75d3f8..fa7156eec7b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,7 +1,7 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/NoFieldTypeRef|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index a248f9e86d5..346cfc73783 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -1,5 +1,5 @@
 public open class NotVarargReplacedWithVararg : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     public constructor(): R|test/NotVarargReplacedWithVararg|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
index 7352cd92eb1..78550eac237 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
@@ -1,5 +1,5 @@
 public open class ReturnTypeMissing : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Int|
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/Int|
 
     public constructor(): R|test/ReturnTypeMissing|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
index 6d2c7951d7f..fb9fe5048a9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
@@ -1,5 +1,5 @@
 public open class SyntaxError : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|?
+    public open fun foo(): R|kotlin/Int?|
 
     public constructor(): R|test/SyntaxError|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index 4f7e695a6ab..fc5eb689fac 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,7 +1,7 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/SyntaxErrorInFieldAnnotation|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index 8a00a50e2ef..56e9dcaaec2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -1,5 +1,5 @@
 public open class VarargReplacedWithNotVararg : R|kotlin/Any| {
-    public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+    public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargReplacedWithNotVararg|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
index b3ab756a425..d41a74c6369 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,7 +1,7 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldInitializer|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
index d193fc8c63b..5b425d9530d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,10 +1,10 @@
 public open class WrongFieldMutability : R|kotlin/Any| {
-    public final val fooFinal: R|kotlin/String|?
-        public get(): R|kotlin/String|?
+    public final val fooFinal: R|kotlin/String?|
+        public get(): R|kotlin/String?|
 
-    public final var fooNotFinal: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var fooNotFinal: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldMutability|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
index d1c5075bcb6..7cac7455288 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,7 +1,7 @@
 public open class WrongFieldName : R|kotlin/Any| {
-    public final var foo: R|kotlin/String|?
-        public get(): R|kotlin/String|?
-        public set(value: R|kotlin/String|?): kotlin/Unit
+    public final var foo: R|kotlin/String?|
+        public get(): R|kotlin/String?|
+        public set(value: R|kotlin/String?|): kotlin/Unit
 
     public constructor(): R|test/WrongFieldName|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
index 8ca925ddd07..91cefe1247a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
@@ -1,5 +1,5 @@
 public open class WrongMethodName : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/String|?
+    public open fun foo(): R|kotlin/String?|
 
     public constructor(): R|test/WrongMethodName|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
index 8aca07af292..b17c9881db8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -1,5 +1,5 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>|?, p1: R|kotlin/Array<out kotlin/Number>|?): R|kotlin/collections/MutableList<kotlin/Number>|?
+    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>?|, p1: R|kotlin/Array<out kotlin/Number>?|): R|kotlin/collections/MutableList<kotlin/Number>?|
 
     public constructor(): R|test/WrongProjectionKind|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index 01556d03833..e4ba27cbd3a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -1,5 +1,5 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongReturnTypeStructure|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
index d8e3c12c563..95a795d3f76 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeName1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName1|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
index c5e486a04ea..28c3e48e6e7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeName2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName2|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
index 7c63c3f0d92..61e5603c2a1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeName3 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongTypeName3|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index e1fa026645e..2b838fb2961 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|?, R|kotlin/collections/List<kotlin/Cloneable>|?> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index d1209236813..f0b1b1ca441 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
-    public open fun <A, B : R|java/lang/Runnable|?, R|kotlin/collections/List<kotlin/Cloneable>|?> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/List<kotlin/Cloneable>?|> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure2|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index 9cbe11aa344..3b11ae96156 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParametersCount : R|kotlin/Any| {
-    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+    public open fun <A, B> foo(p0: R|A|, p1: R|kotlin/collections/List<B>?|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParametersCount|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 801188d8417..802d47e1198 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongValueParameterStructure1|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index c0d43767cf0..3b9a9fe1bac 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -1,5 +1,5 @@
 public open class WrongValueParameterStructure2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+    public open fun foo(p0: R|kotlin/String?|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>?|): R|kotlin/String?|
 
     public constructor(): R|test/WrongValueParameterStructure2|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
index 0c15fdb8379..ef0d9e26c58 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
@@ -1,5 +1,5 @@
 public open class WrongValueParametersCount : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|?
+    public open fun foo(): R|kotlin/Int?|
 
     public constructor(): R|test/WrongValueParametersCount|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index f804a27814e..b25946e7de6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -1,31 +1,31 @@
 public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| {
     public abstract interface Sub : R|test/PropagateTypeArgumentNullable.Super| {
-        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|
+        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|
 
-        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String?>|
 
-        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun outR(): R|kotlin/collections/List<kotlin/String?>|
 
-        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
-        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|
+        public abstract fun invOutR(): R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|
 
-        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun invOutS(p: R|kotlin/collections/MutableList<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun invR(): R|kotlin/collections/MutableList<kotlin/String?>|
 
-        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String>>|): R|kotlin/Unit|
+        public abstract fun outOutS(p: R|kotlin/collections/List<kotlin/collections/List<kotlin/String?>>|): R|kotlin/Unit|
 
-        public abstract fun outR(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun outR(): R|kotlin/collections/List<kotlin/String?>|
 
-        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit|
+        public abstract fun outS(p: R|kotlin/collections/List<kotlin/String?>|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index 970d5dc04d2..14baa33df82 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVararg.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>?|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 20d3aeb0203..5572fc6bfc8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>?|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index 4186233afd1..4351c2917dc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
-        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray?|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
index 8de11d409d4..d0759f68338 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVararg.Super| {
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
index 0a3958e0817..56a21778455 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritVarargInteger.Super| {
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int?>|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(vararg p0: R|kotlin/Array<out kotlin/Int?>|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
index eada6352304..61a64bd5ce3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -2,12 +2,12 @@ public abstract interface Kt3302 : R|kotlin/Any| {
     public abstract interface BSONObject : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any|?
+        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any?|
 
     }
 
     public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String, kotlin/Any>|, R|test/Kt3302.BSONObject| {
-        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any|?
+        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index b5ae929498b..9c136c60586 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNull.Super| {
-        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index 39e72e2f40e..2411089201e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
-        public abstract fun foo(p: R|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 dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p: R|kotlin/String|?): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String?|): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index 504da5b82c5..99e4678e7fd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -7,7 +7,7 @@ public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index 7de6a021b83..0c905221592 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -7,7 +7,7 @@ public abstract interface AddNotNullSameJavaType : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 08efe649876..042245037f4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -1,13 +1,13 @@
 public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
     public abstract interface Sub : R|test/HalfSubstitutedTypeParameters.Super| {
-        public abstract fun foo(): R|test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int, kotlin/String>|
+        public abstract fun foo(): R|test/HalfSubstitutedTypeParameters.TrickyList<kotlin/Int, kotlin/String?>|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/MutableList<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/MutableList<kotlin/String?>|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index 8f7bd0d10ad..5e88b692b20 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -1,13 +1,13 @@
 public abstract interface SameProjectionKind : R|kotlin/Any| {
     public abstract interface Sub : R|test/SameProjectionKind.Super| {
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number?>?|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number?>?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
index 2e9efbbafea..bc65bd704d5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
@@ -9,7 +9,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
     public abstract interface NonGeneric : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/String|?
+        public abstract fun foo(): R|kotlin/String?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index fe0eaf2aef9..1fbfcc015c5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability :
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String?>|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index d1453da60a8..ba74be80831 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index 6efe800a818..e2a5548fd07 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|?
+        public abstract fun foo(): R|kotlin/CharSequence?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index fce9491e0e7..dab2f2febc4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -7,14 +7,14 @@ public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String?>|
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|?
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>?|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
index e0ce9470481..18c774b7fb1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterable<T> : R|kotlin/Any| {
-    public abstract fun getIterable(): R|kotlin/collections/MutableIterable<T>|?
+    public abstract fun getIterable(): R|kotlin/collections/MutableIterable<T>?|
 
-    public abstract fun setIterable(p0: R|kotlin/collections/Iterable<T>|?): R|kotlin/Unit|
+    public abstract fun setIterable(p0: R|kotlin/collections/Iterable<T>?|): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
index 4a942f1873c..2cd9ebe709a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterator<T> : R|kotlin/Any| {
-    public abstract fun getIterator(): R|kotlin/collections/MutableIterator<T>|?
+    public abstract fun getIterator(): R|kotlin/collections/MutableIterator<T>?|
 
-    public abstract fun setIterator(p0: R|kotlin/collections/Iterator<T>|?): R|kotlin/Unit|
+    public abstract fun setIterator(p0: R|kotlin/collections/Iterator<T>?|): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
index b6ec605492a..c640981adad 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open fun <T : R|kotlin/Comparable<T>|?> max(p0: R|kotlin/collections/Collection<T>|?): R|T|
+    public open fun <T : R|kotlin/Comparable<T>?|> max(p0: R|kotlin/collections/Collection<T>?|): R|T|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
index a6d96b30ac7..f0627af3324 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -1 +1 @@
-public final fun ff(p: R|kotlin/collections/List<java/lang/CharSequence>|): R|kotlin/Int|
+public final fun ff(p: R|kotlin/collections/List<java/lang/CharSequence?>|): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
index 8a3661e3ffe..6f6d6767d64 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -1 +1 @@
-public final fun fff(a: R|java/lang/Integer|?): R|kotlin/Int|
+public final fun fff(a: R|java/lang/Integer?|): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
index c83bc254074..fea9cad3cdd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -1 +1 @@
-public final fun ffgg(): R|kotlin/collections/List<kotlin/CharSequence>|
+public final fun ffgg(): R|kotlin/collections/List<kotlin/CharSequence?>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
index 0c03c3b8c0b..126511ebd48 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
@@ -1 +1 @@
-public final fun ff(): R|java/lang/Integer|?
+public final fun ff(): R|java/lang/Integer?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
index c35c79f79de..3f1609900ae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
@@ -1,5 +1,5 @@
 public open class VarargString : R|kotlin/Any| {
-    public open fun vararg(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+    public open fun vararg(vararg p0: R|kotlin/Array<out kotlin/String?>|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargString|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
index ee1d6b3a6a6..a4eec70b1c1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
@@ -1,4 +1,4 @@
-public final class C : R|java/util/ArrayList<kotlin/String>| {
+public final class C : R|java/util/ArrayList<kotlin/String?>| {
     public constructor(): R|test/C|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
index 9044731e70f..0300dbce781 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -1,6 +1,6 @@
 public final class ExtValInClass : R|kotlin/Any| {
-    public final val R|kotlin/Int|.asas: R|java/util/List<kotlin/Int>|?
-        public get(): R|java/util/List<kotlin/Int>|?
+    public final val R|kotlin/Int|.asas: R|java/util/List<kotlin/Int>?|
+        public get(): R|java/util/List<kotlin/Int>?|
 
     public constructor(): R|test/ExtValInClass|
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
index 166b37989eb..10a3ea4f6bd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
@@ -1 +1 @@
-public final fun anyq(): R|kotlin/Any|?
+public final fun anyq(): R|kotlin/Any?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
index b8e7f5fc4c9..15c45071565 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
@@ -1 +1 @@
-public final fun fff(): R|kotlin/Int|?
+public final fun fff(): R|kotlin/Int?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
index 3a80d986df0..82a12b8d9ee 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
@@ -1 +1 @@
-public final fun integerq(): R|java/lang/Integer|?
+public final fun integerq(): R|java/lang/Integer?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
index ee7eca57acf..cdc9dd18543 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
@@ -1 +1 @@
-public final fun objq(): R|java/lang/Object|?
+public final fun objq(): R|java/lang/Object?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
index d88d578e566..cec585b2ebd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
@@ -1 +1 @@
-public final fun fff(): R|java/lang/String|?
+public final fun fff(): R|java/lang/String?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/ListOfAnyQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/ListOfAnyQ.txt
index 2749316e59f..7e6c2813c87 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/ListOfAnyQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/ListOfAnyQ.txt
@@ -1 +1 @@
-public final fun listOfAnyQ(): R|kotlin/collections/List<kotlin/Any>|
+public final fun listOfAnyQ(): R|kotlin/collections/List<kotlin/Any?>|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
index 60dc66fe3b9..221c54b6b85 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
@@ -1 +1 @@
-public final fun nothingq(): R|kotlin/Nothing|?
+public final fun nothingq(): R|kotlin/Nothing?|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
index cda913d1422..637794299e9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
@@ -1,5 +1,5 @@
-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<ft<kotlin/Int, kotlin/Int?>!>, kotlin/Array<out ft<kotlin/Int, 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<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|
 
-public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream?>|!
+public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream?>!|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
index e7c1507e950..2b0e7ddad40 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
@@ -1 +1 @@
-public final fun fff(): R|kotlin/String|?
+public final fun fff(): R|kotlin/String?|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/inference/id.txt b/compiler/fir/resolve/testData/resolve/expresssions/inference/id.txt
index b1f30fb1096..3db87793803 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/inference/id.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/inference/id.txt
@@ -4,6 +4,6 @@ FILE: id.kt
     }
     public final fun main(): R|kotlin/Unit| {
         lval a: R|kotlin/String| = R|/id|<R|kotlin/String|>(String(string))
-        lval b: R|kotlin/Nothing|? = R|/id|<R|kotlin/Nothing|?>(Null(null))
+        lval b: R|kotlin/Nothing?| = R|/id|<R|kotlin/Nothing?|>(Null(null))
         lval c: R|kotlin/String| = R|/id|<R|kotlin/String|>(R|/id|<R|kotlin/String|>(R|<local>/a|))
     }
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/simple.txt b/compiler/fir/resolve/testData/resolve/expresssions/simple.txt
index 69a860b8d4f..b263f0983f0 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/simple.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/simple.txt
@@ -4,7 +4,7 @@ FILE: simple.kt
     }
     public final val bar: R|kotlin/String| = String()
         public get(): R|kotlin/String|
-    public final val n: R|kotlin/Nothing|? = Null(null)
-        public get(): R|kotlin/Nothing|?
-    public final val g: R|kotlin/String|? = Null(null)
-        public get(): R|kotlin/String|?
+    public final val n: R|kotlin/Nothing?| = Null(null)
+        public get(): R|kotlin/Nothing?|
+    public final val g: R|kotlin/String?| = Null(null)
+        public get(): R|kotlin/String?|
diff --git a/compiler/fir/resolve/testData/resolve/expresssions/when.txt b/compiler/fir/resolve/testData/resolve/expresssions/when.txt
index 7c09d383462..2207549b41c 100644
--- a/compiler/fir/resolve/testData/resolve/expresssions/when.txt
+++ b/compiler/fir/resolve/testData/resolve/expresssions/when.txt
@@ -10,7 +10,7 @@ FILE: when.kt
         }
 
     }
-    public final fun bar(arg: R|kotlin/Any|?): R|kotlin/Int| {
+    public final fun bar(arg: R|kotlin/Any?|): R|kotlin/Int| {
         ^bar when (R|<local>/arg|) {
             ($subj$ is R|kotlin/Int|) ->  {
                 (R|<local>/arg| as R|kotlin/Int|)
diff --git a/compiler/fir/resolve/testData/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
index 0d2010ef6c4..086b8248783 100644
--- a/compiler/fir/resolve/testData/resolve/genericFunctions.txt
+++ b/compiler/fir/resolve/testData/resolve/genericFunctions.txt
@@ -1,7 +1,7 @@
 FILE: genericFunctions.kt
     public abstract interface Any : R|kotlin/Any| {
     }
-    public final inline fun <reified T : R|Any|> R|Any|.safeAs(): R|T|? {
+    public final inline fun <reified T : R|Any|> R|Any|.safeAs(): R|T?| {
         ^safeAs (this# as? R|T|)
     }
     public abstract class Summator : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/resolve/intersectionTypes.txt b/compiler/fir/resolve/testData/resolve/intersectionTypes.txt
new file mode 100644
index 00000000000..4d7759be1c0
--- /dev/null
+++ b/compiler/fir/resolve/testData/resolve/intersectionTypes.txt
@@ -0,0 +1,27 @@
+FILE: intersectionTypes.kt
+    public abstract interface A : R|kotlin/Any| {
+    }
+    public abstract interface B : R|kotlin/Any| {
+    }
+    public final class Clazz1 : R|A|, R|B| {
+        public constructor(): R|Clazz1| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public final class Clazz2 : R|A|, R|B| {
+        public constructor(): R|Clazz2| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
+    public final fun <K> select(x: R|K|, y: R|K|): R|K|
+    public final fun test(): R|it(A & B)| {
+        ^test R|/select|<R|it(A & B)|>(R|/Clazz1.Clazz1|(), R|/Clazz2.Clazz2|())
+    }
+    public final fun <T> makeNull(x: R|T|): R|T|? {
+        ^makeNull Null(null)
+    }
+    public final fun testNull(): R|it(A & B)| {
+        ^testNull R|/makeNull|<R|it(A & B)|>(R|/select|<R|it(A & B)|>(R|/Clazz1.Clazz1|(), R|/Clazz2.Clazz2|()))
+    }
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt b/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt
index 8457b9628b1..4511de8fe52 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/arrayFirstOrNull.txt
@@ -5,9 +5,9 @@ FILE: arrayFirstOrNull.kt
 
     }
     public final fun goo(g: R|G|): R|kotlin/Unit| {
-        lval x: R|G|? = R|<local>/g|.R|/G.a|.R|/firstOrNullX|<R|G|>()
+        lval x: R|G?| = R|<local>/g|.R|/G.a|.R|/firstOrNullX|<R|G|>()
     }
-    public final fun <T> R|kotlin/Array<out T>|.firstOrNullX(): R|T|? {
+    public final fun <T> R|kotlin/Array<out T>|.firstOrNullX(): R|T?| {
         ^firstOrNullX when () {
             R|kotlin/collections/isEmpty|<R|T|>() ->  {
                 Null(null)
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
index 6f17aff1ab7..b6b9defbd83 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.txt
@@ -6,8 +6,8 @@ FILE: factoryFunctionOverloads.kt
             public get(): R|B|
 
     }
-    public final fun A(b: R|B|?, flag: R|kotlin/Boolean| = Boolean(true)): R|A| {
-        ^A R|/A.A|(when (lval <bangbang>: R|B|? = R|<local>/b|) {
+    public final fun A(b: R|B?|, flag: R|kotlin/Boolean| = Boolean(true)): R|A| {
+        ^A R|/A.A|(when (lval <bangbang>: R|B?| = R|<local>/b|) {
             ==($subj$, Null(null)) ->  {
                 throw R|kotlin/KotlinNullPointerException.KotlinNullPointerException|()
             }
@@ -32,7 +32,7 @@ FILE: factoryFunctionOverloads.kt
             public get(): R|kotlin/Boolean|
 
     }
-    public final fun foo(c: R|C|, b: R|B|, bn: R|B|?): R|kotlin/Unit| {
+    public final fun foo(c: R|C|, b: R|B|, bn: R|B?|): R|kotlin/Unit| {
         lval x: R|A| = R|/A|(R|<local>/c|)
         lval y: R|A| = R|/A.A|(R|<local>/b|)
         lval z: R|A| = R|/A.A|(R|<local>/bn|)
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt b/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt
index 699ed51e0c5..1a5a93b2ff4 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/hashSet.txt
@@ -1,24 +1,24 @@
 FILE: hashSet.kt
-    public final val a: R|kotlin/collections/MutableSet<kotlin/String>|? = R|java/util/HashSet.HashSet|<R|kotlin/String|>()
-        public get(): R|kotlin/collections/MutableSet<kotlin/String>|?
-    public final var b: R|kotlin/collections/MutableSet<kotlin/String>|? = Null(null)
-        public get(): R|kotlin/collections/MutableSet<kotlin/String>|?
-        public set(_: R|kotlin/collections/MutableSet<kotlin/String>|?): R|kotlin/Unit| {
+    public final val a: R|kotlin/collections/MutableSet<kotlin/String>?| = R|java/util/HashSet.HashSet|<R|kotlin/String|>()
+        public get(): R|kotlin/collections/MutableSet<kotlin/String>?|
+    public final var b: R|kotlin/collections/MutableSet<kotlin/String>?| = Null(null)
+        public get(): R|kotlin/collections/MutableSet<kotlin/String>?|
+        public set(_: R|kotlin/collections/MutableSet<kotlin/String>?|): R|kotlin/Unit| {
             F|/b| = R|java/util/HashSet.HashSet|<R|kotlin/String|>()
         }
-    public final var <T> R|kotlin/collections/MutableSet<T>|.d: R|T|?
-        public get(): R|T|? {
+    public final var <T> R|kotlin/collections/MutableSet<T>|.d: R|T?|
+        public get(): R|T?| {
             ^ Null(null)
         }
-        public set(_: R|T|?): R|kotlin/Unit| {
+        public set(_: R|T?|): R|kotlin/Unit| {
         }
     public final fun <T> produce(): R|T| {
         ^produce R|kotlin/TODO|()
     }
     public final fun foo(): R|kotlin/Unit| {
-        lvar c: R|kotlin/collections/MutableSet<kotlin/String>|? = Null(null)
+        lvar c: R|kotlin/collections/MutableSet<kotlin/String>?| = Null(null)
         R|<local>/c| = R|java/util/HashSet.HashSet|<R|kotlin/String|>()
-        when (lval <bangbang>: R|kotlin/collections/MutableSet<kotlin/String>|? = R|<local>/c|) {
+        when (lval <bangbang>: R|kotlin/collections/MutableSet<kotlin/String>?| = R|<local>/c|) {
             ==($subj$, Null(null)) ->  {
                 throw R|kotlin/KotlinNullPointerException.KotlinNullPointerException|()
             }
@@ -26,5 +26,5 @@ FILE: hashSet.kt
                 R|<local>/<bangbang>|!
             }
         }
-        .R|/d| = R|/produce|<R|T|?>()
+        .R|/d| = R|/produce|<R|T?|>()
     }
diff --git a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt b/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt
index 53afe52c117..505566539ea 100644
--- a/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt
+++ b/compiler/fir/resolve/testData/resolve/stdlib/simpleDelegateProvider.txt
@@ -7,7 +7,7 @@ FILE: simpleDelegateProvider.kt
         public final val value: R|kotlin/String| = R|<local>/value|
             public get(): R|kotlin/String|
 
-        public final operator fun getValue(thisRef: R|kotlin/Any|?, property: R|kotlin/Any|?): R|kotlin/String| {
+        public final operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/Any?|): R|kotlin/String| {
             ^getValue R|/Delegate.value|
         }
 
@@ -20,7 +20,7 @@ FILE: simpleDelegateProvider.kt
         public final val value: R|kotlin/String| = R|<local>/value|
             public get(): R|kotlin/String|
 
-        public final operator fun provideDelegate(thisRef: R|kotlin/Any|?, property: R|kotlin/Any|?): R|Delegate| {
+        public final operator fun provideDelegate(thisRef: R|kotlin/Any?|, property: R|kotlin/Any?|): R|Delegate| {
             ^provideDelegate R|/Delegate.Delegate|(R|/DelegateProvider.value|)
         }
 
diff --git a/compiler/fir/resolve/testData/resolve/treeSet.txt b/compiler/fir/resolve/testData/resolve/treeSet.txt
index adcd95dd630..b01529b47fd 100644
--- a/compiler/fir/resolve/testData/resolve/treeSet.txt
+++ b/compiler/fir/resolve/testData/resolve/treeSet.txt
@@ -1,3 +1,3 @@
 FILE: treeSet.kt
-    public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|kotlin/Any|?>()
+    public final val x: R|java/util/SortedSet<kotlin/Int>| = R|java/util/TreeSet.TreeSet|<R|kotlin/Any?|>()
         public get(): R|java/util/SortedSet<kotlin/Int>|
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index 3ef2f4ca19d..4f0eba90ecc 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -724,9 +724,6 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
         if (resolvedTypeRef !is FirImplicitBuiltinTypeRef) {
             print("|")
         }
-        if (coneType !is ConeKotlinErrorType && coneType !is ConeClassErrorType) {
-            print(coneType.nullability.suffix)
-        }
     }
 
     override fun visitUserTypeRef(userTypeRef: FirUserTypeRef) {
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
index f80078702d0..5009c29dbce 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/nullableAnyAsIntToDouble.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Int
               GET_VAR 'x: kotlin.Any? declared in <root>.test' type=kotlin.Any? origin=null
-            then: ERROR_CALL 'Comparison of arguments with different types: kotlin/Any, kotlin/Double' type=kotlin.Boolean
+            then: ERROR_CALL 'Comparison of arguments with different types: kotlin/Any?, kotlin/Double' type=kotlin.Boolean
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
index 4727e246cfd..380ff4b6858 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 operator fun toArray(p0: R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|
+    public final operator fun toArray(p0: R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|
 
     public constructor(): R|test/ArrayTypeVariance|
 
diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
index 763f8f273d7..eb638483a54 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|kotlin/Array<ft<java/io/File, java/io/File?>>|
+    public open field files: R|kotlin/Array<ft<java/io/File, java/io/File?>!>|
 
     public constructor(): R|test/FieldOfArrayType|
 
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index b8fce28ab68..fc109a567d5 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -1,5 +1,5 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
-    public open operator 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 operator 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 constructor(): R|test/InnerClassTypeMultipleGeneric|
 
diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt
index f917b3c421f..a764753f27b 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 operator fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>!|): R|kotlin/Unit|
 
-    public abstract operator fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>!|): R|kotlin/Unit|
 
-    public abstract operator fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>!|): R|kotlin/Unit|
 
-    public abstract operator fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>!|): R|kotlin/Unit|
 
-    public abstract operator fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
index dcd9335c8d7..8a2be680ef3 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 operator fun <P> f(p: R|ft<P, P?>|!): R|kotlin/Unit|
+    public final operator fun <P> f(p: R|ft<P, 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 9d02dfc182f..d0b5ce80202 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|ft<kotlin/String, kotlin/String?>!|, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>!|): R|test/MyException|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
index 883043108f6..6f73209dad3 100644
--- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
@@ -1,13 +1,13 @@
 public open class Frame : R|kotlin/Any| {
-    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
+    public/*package*/ open field accessibleContext: R|ft<kotlin/String, 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|ft<kotlin/String, kotlin/String?>!|
 
-    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
+    public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JFrame|
 
diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt
index fb78090fa03..c83477aa9de 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 operator fun f(collection: R|ft<kotlin/collections/MutableCollection<out kotlin/CharSequence>, kotlin/collections/Collection<out kotlin/CharSequence>?>|!): R|kotlin/Unit|
+    public abstract operator fun f(collection: R|ft<kotlin/collections/MutableCollection<out kotlin/CharSequence>, kotlin/collections/Collection<out kotlin/CharSequence>?>!|): R|kotlin/Unit|
 
-    public abstract operator fun f(comparator: R|ft<kotlin/Comparable<in kotlin/CharSequence>, kotlin/Comparable<in kotlin/CharSequence>?>|!): R|kotlin/Unit|
+    public abstract operator 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 4e11c10558b..230ff6560ce 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 operator fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|!): R|kotlin/Unit|
+    public open operator fun foo(other: R|ft<test/TopLevel$Class, 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 214e9b800ed..454ccab223e 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
@@ -1,7 +1,7 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final operator fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>|!
+    public final operator fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>!|
 
-    public final operator fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>|!
+    public final operator fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>!|
 
     public constructor(): R|test/UnboundWildcard|
 
diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
index 8eaeb5c9433..a9d9eff9a71 100644
--- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
@@ -1,5 +1,5 @@
 public open class WildcardBounds : R|kotlin/Any| {
-    public/*package*/ open operator 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/*package*/ open operator 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|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
index 21ffead5751..aaeaaa21ca4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
@@ -1,8 +1,8 @@
 public final enum class AnnotatedEnumEntry : R|kotlin/Enum<test/AnnotatedEnumEntry>| {
-    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static field E1: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static field E1: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!|
 
-    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static field E2: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static field E2: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!|
 
-    public final static field E3: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    public final static field E3: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
index cf9eff44a4c..d4879490847 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 operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>!|, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, 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 c0ded39f978..53039c6221b 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 operator fun f(@R|test/AnnotatedValueParameter.Anno|(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 operator fun f(@R|test/AnnotatedValueParameter.Anno|(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 constructor(): R|test/AnnotatedValueParameter|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
index 2bfec87a9f9..6b2b6c726c2 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
@@ -1,7 +1,7 @@
 public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter>| {
-    public final static field INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
+    public final static field INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>!|
 
-    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
+    private constructor(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, 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 5587653aa5e..3d8f9338a60 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 operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|test/JavaDocDeprecated|
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
index a271731ce54..3bd585ef114 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface StringConstantInParam : R|kotlin/Any| {
-    public final static field HEL: R|ft<kotlin/String, kotlin/String?>|!
+    public final static field HEL: R|ft<kotlin/String, kotlin/String?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt
index 1209745d4f1..7acd79cffb7 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>(cl: R|ft<java/lang/Class<ft<P, P?>>, java/lang/Class<ft<P, P?>>?>|!): R|test/ConstructorGenericDeep|
+    public constructor<P>(cl: R|ft<java/lang/Class<ft<P, P?>!>, java/lang/Class<ft<P, 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 e88567dbb3a..24691d7a3a3 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>(p: R|ft<P, P?>|!): R|test/ConstructorGenericSimple|
+    public constructor<P>(p: R|ft<P, 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 9fb5acdfbff..f8ffe9294a1 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|java/util/RandomAccess|>(p: R|ft<P, P?>|!): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|java/util/RandomAccess|>(p: R|ft<P, 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 c713d383cf5..1742599bc40 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt
@@ -1,7 +1,7 @@
 public final enum class EnumMembers : R|kotlin/Enum<test/EnumMembers>| {
-    public final static field FIRST: R|ft<test/EnumMembers, test/EnumMembers?>|!
+    public final static field FIRST: R|ft<test/EnumMembers, test/EnumMembers?>!|
 
-    public final static field SECOND: R|ft<test/EnumMembers, test/EnumMembers?>|!
+    public final static field SECOND: R|ft<test/EnumMembers, 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 c364e8cd8e9..464da9110c3 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
@@ -1,6 +1,6 @@
 public open enum class EnumWithSpecializedEntry : R|kotlin/Enum<test/EnumWithSpecializedEntry>| {
-    public final static field E1: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
+    public final static field E1: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!|
 
-    public final static field E2: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
+    public final static field E2: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
index 9ebe41e1696..9bf81a65732 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt
@@ -1,6 +1,6 @@
 public final enum class JavaEnum : R|kotlin/Enum<test/JavaEnum>| {
-    public final static field ENTRY: R|ft<test/JavaEnum, test/JavaEnum?>|!
+    public final static field ENTRY: R|ft<test/JavaEnum, test/JavaEnum?>!|
 
-    public final static field ANOTHER: R|ft<test/JavaEnum, test/JavaEnum?>|!
+    public final static field ANOTHER: R|ft<test/JavaEnum, test/JavaEnum?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
index 17df800eefe..b2d2d652eab 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 operator fun setSomething(color: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setSomething(color: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open operator 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 f320ff33892..6f21a769907 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 operator fun getColor(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getColor(): R|ft<kotlin/String, 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 26c0752064e..c1c99595c45 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 operator fun getColor(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getColor(): R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun setColor(string: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setColor(string: R|ft<kotlin/String, 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 bdfe8a0245e..bb17f973632 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
@@ -1,7 +1,7 @@
 public open class JavaBeanVarOfGenericType<P> : R|kotlin/Any| {
-    public open operator fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
+    public open operator fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|
 
-    public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
+    public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>!>, java/util/ArrayList<ft<P, P?>!>?>!|): R|kotlin/Unit|
 
     public constructor<P>(): 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 262fb5aae9c..3fa7758b76f 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 operator fun setSize(size: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setSize(size: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public open operator fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
index d575d8a4d4d..75e3b256a5a 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 operator fun foo(): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
+    public open operator fun foo(): R|kotlin/Array<ft<kotlin/String, 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 a60bfdac6d7..12948c9f245 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|kotlin/Any| {
-    public constructor<T, U>(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams<T>|
+    public constructor<T, U>(first: R|ft<U, 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 1abd7f38e7b..7c2b0fb8a43 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|kotlin/Any| {
-    public constructor<T>(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams<T>|
+    public constructor<T>(first: R|ft<T, 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 5af845ae883..db7f7621e44 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|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|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
index 2c886e25593..e529029229d 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 operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
+    public open operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, 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 2c7fe13e51c..f35ab9e3320 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 operator 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 operator 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 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 fc9e96dabd5..8731fbcd808 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 operator 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 operator 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 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 25fd2ecf1b6..52571fcf562 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 operator fun <T> copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>|!, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun <T> copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>!|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>!>, kotlin/collections/List<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
-    public open operator fun <T> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, in T>?>|!, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun <T> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, in T>?>!|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, ft<T, 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 176080ab902..be91524e238 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 operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>|!): R|kotlin/Unit|
+    public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<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 ce0dc3f45da..43e46128294 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 operator fun foo(vararg s: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
+    public open operator fun foo(vararg s: R|kotlin/Array<ft<kotlin/String, 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 d8b3f99252d..1461979e7c9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
@@ -1,9 +1,9 @@
 public open class PropertyArrayTypes<T> : R|kotlin/Any| {
-    public open field arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|
+    public open field arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<ft<kotlin/String, kotlin/String?>!>?>!>|
 
-    public open field array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
+    public open field array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|
 
-    public open field genericArray: R|kotlin/Array<ft<T, T?>>|
+    public open field genericArray: R|kotlin/Array<ft<T, T?>!>|
 
     public constructor<T>(): 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 1b8df9dcd26..adb4b84dde3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
@@ -1,11 +1,11 @@
 public open class PropertyComplexTypes<T> : R|kotlin/Any| {
-    public open field genericType: R|ft<T, T?>|!
+    public open field genericType: R|ft<T, 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<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|
 
-    public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
+    public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!|
 
-    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
+    public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>?>!|
 
     public constructor<T>(): 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 f1ed7767942..db53eb1586a 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|ft<kotlin/String, kotlin/String?>!|
 
-    public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
+    public open field fieldTwo: R|ft<kotlin/String, 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 b90314b4f1d..8e80131a7ce 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
@@ -1,5 +1,5 @@
 public final class StarProjection : R|kotlin/Any| {
-    public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>|!
+    public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
 
     public constructor(): R|test/StarProjection|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
index 5089f2e2eea..9b3d7d82eda 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 operator fun copy(from: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>>|, to: R|kotlin/Array<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 operator fun copy(from: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>|, to: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, 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 7b49d9da715..086cfbebdfa 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 operator 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 operator 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 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 18bd8f88689..f0e900e28ad 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 operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!): R|kotlin/Unit|
+    public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out 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 f92ae8d7656..09aa2535a1c 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 operator 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 operator 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 constructor(): R|test/WrongValueParameterStructure1|
 
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 f6602c058e3..4610cbb8125 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|kotlin/collections/MutableCollection<E>| {
-    public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<ft<E, E?>>|
+    public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<ft<E, E?>!>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
index 8a75b7c1f8a..e5ae89560bb 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterable<T> : R|kotlin/Any| {
-    public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract operator fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, 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 d1b3de64fe1..e81fd294422 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterator<T> : R|kotlin/Any| {
-    public abstract operator fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!
+    public abstract operator fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, T?>!>?>!|
 
-    public abstract operator fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>!>, kotlin/collections/Iterator<ft<T, 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 19f4705ebec..02b6a65ac46 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 operator fun <T : R|kotlin/Any|, R|kotlin/Comparable<in T>|> max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>|!): R|ft<T, T?>|!
+    public open operator fun <T : R|kotlin/Any|, R|kotlin/Comparable<in T>|> max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>!|): R|ft<T, T?>!|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
index b7b399d597a..36fe8d7d420 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface LoadIterable<T> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|
 
-    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
-    @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, 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 d1a76b1d714..77f9b48ba42 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface LoadIterableWithConflict<T> : R|kotlin/Any| {
-    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
 
-    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, 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 3815f847e03..2226391c69d 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
@@ -1,10 +1,10 @@
 public abstract interface LoadIterableWithNullability<T> : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|kotlin/collections/MutableIterable<ft<T, T?>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|kotlin/collections/MutableIterable<ft<T, T?>!>|
 
-    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/MutableIterable<ft<T, T?>>|): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/MutableIterable<ft<T, T?>!>|): R|kotlin/Unit|
 
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|kotlin/collections/Iterable<ft<T, T?>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|kotlin/collections/Iterable<ft<T, T?>!>|
 
-    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable<ft<T, T?>>|): R|kotlin/Unit|
+    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable<ft<T, T?>!>|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
index c7fa4b5ca85..9f3748c0878 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 operator fun bar(): R|kotlin/Unit|
 
-    public abstract operator 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|kotlin/Comparable<in kotlin/String>|): R|kotlin/Unit|
+    public abstract operator 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|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 e5c30dcf7f9..58dd9ea6800 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 operator fun hi(): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|
 
     public constructor(): R|test/NotNullObjectArray|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
index 593a4eaef91..a670f6713ec 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
@@ -1,6 +1,6 @@
 public abstract interface Comparator<T> : R|kotlin/Any| {
-    public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
+    public abstract operator fun compare(o1: R|ft<T, T?>!|, o2: R|ft<T, T?>!|): R|kotlin/Int|
 
-    public abstract operator fun equals(obj: R|kotlin/Any|?): R|kotlin/Boolean|
+    public abstract operator fun equals(obj: R|kotlin/Any?|): R|kotlin/Boolean|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
index 59c8fc2fde8..86c66f156c3 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 operator fun accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
+    public abstract operator fun accept(dir: R|ft<java/io/File, java/io/File?>!|, name: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
index 46e9aacaa49..eedcc50a97c 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface GenericInterfaceParameterWithSelfBound<T : R|test/GenericInterfaceParameterWithSelfBound<T>|> : R|kotlin/Any| {
-    public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public abstract operator fun method(t: R|ft<T, T?>!|): R|ft<T, T?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
index 0a557b2ebfe..38c3e289862 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|kotlin/Comparable<A>|, R|kotlin/Cloneable|, B : R|kotlin/collections/MutableList<A>|> : R|kotlin/Any| {
-    public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
+    public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, 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 51e16490dbb..6b48ed17ac1 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 operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
+    public abstract operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
index 7d4fcf6dbaa..0bffe5d383d 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 operator fun f(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
+    public abstract operator fun f(vararg strings: R|kotlin/Array<ft<kotlin/String, 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 9a0b8a038ac..b5e374cd54d 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 operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open operator fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
+    public open operator fun foo(c: R|ft<java/io/Closeable, 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 b5057aefda0..8c7cff1966e 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 operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
 
-    public open static operator fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open static operator fun bar(r: R|ft<java/lang/Runnable, 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 d2e059796e3..0f0c72f6b81 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|ft<java/lang/Runnable, 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 adef2812287..a2c9c83e939 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|kotlin/String|): R|test/ConstructorWithAnnotations|
+    public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
index 75618955ba2..3edf860cc5a 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 operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
+    public open operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
 
-    public open operator 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 operator 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 operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
+    public open operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
 
-    public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence>, java/util/Comparator<in kotlin/CharSequence>?>|!): R|kotlin/Unit|
+    public open operator 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 aabd13da124..2e99102f70b 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 operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
+    private open operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, 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 f2b72bdbf65..ec3e03d4702 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 operator fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
+    public abstract operator fun foo(p: R|ft<test/SelfAsParameter, 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 0fc68d74e9f..80534c787e3 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 operator 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 operator 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 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 5ec2df4c218..fc8a44932fe 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
@@ -1,5 +1,5 @@
 public open class TypeParameterOfClass<T> : R|kotlin/Any| {
-    public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|): R|kotlin/Unit|
 
     public constructor<T>(): 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 f5f3d4e5ca3..176829206fc 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 operator fun <T> max(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public open static operator fun <T> max(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static operator fun <T : R|kotlin/CharSequence|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public open static operator fun <T : R|kotlin/CharSequence|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|ft<java/util/Comparator<ft<A, A?>>, java/util/Comparator<ft<A, A?>>?>|!, b: R|ft<B, B?>|!): R|kotlin/Unit|
+    public open static operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|
 
diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
index e4a04ff7bfc..ccc15584cfc 100644
--- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
@@ -1,5 +1,5 @@
 public open class StableName : R|kotlin/Any| {
-    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/StableName|
 
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
index a72174768ef..90a3811838a 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
@@ -1,5 +1,5 @@
 public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any| {
-    public abstract operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|!
+    public abstract operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>!>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>!>?>!|
 
     public abstract operator 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 9ba1e24125c..bf3e4bf91f5 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
@@ -1,8 +1,8 @@
 public final enum class Enum : R|kotlin/Enum<test/Enum>| {
-    public final static field A: R|ft<test/Enum, test/Enum?>|!
+    public final static field A: R|ft<test/Enum, test/Enum?>!|
 
-    public final static field B: R|ft<test/Enum, test/Enum?>|!
+    public final static field B: R|ft<test/Enum, test/Enum?>!|
 
-    public final static field C: R|ft<test/Enum, test/Enum?>|!
+    public final static field C: R|ft<test/Enum, test/Enum?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
index 6148f923e95..96c80c56dda 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|ft<kotlin/String, kotlin/String?>|!
+    public final static field publicNonNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    public final static field publicNull: R|ft<kotlin/String, kotlin/String?>|!
+    public final static field publicNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    public/*package*/ final static field packageNonNull: R|ft<kotlin/String, kotlin/String?>|!
+    public/*package*/ final static field packageNonNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    public/*package*/ final static field packageNull: R|ft<kotlin/String, kotlin/String?>|!
+    public/*package*/ final static field packageNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    private final static field privateNonNull: R|ft<kotlin/String, kotlin/String?>|!
+    private final static field privateNonNull: R|ft<kotlin/String, kotlin/String?>!|
 
-    private final static field privateNull: R|ft<kotlin/String, kotlin/String?>|!
+    private final static field privateNull: R|ft<kotlin/String, 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 8010e3431d9..653e050fcf6 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt
@@ -1,9 +1,9 @@
 public final enum class StaticMembersInEnum : R|kotlin/Enum<test/StaticMembersInEnum>| {
-    public final static field ENTRY: R|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>|!
+    public final static field ENTRY: R|ft<test/StaticMembersInEnum, 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|ft<test/StaticMembersInEnum, test/StaticMembersInEnum?>!|
 
     public open static operator fun foo(): R|kotlin/Unit|
 
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
index f338636dac8..6f6cb7a43fb 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 operator fun vararg(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
+    public open operator fun vararg(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
 
     public constructor(): R|test/VarargString|
 
diff --git a/idea/testData/fir/lazyResolve/elvis/main.txt b/idea/testData/fir/lazyResolve/elvis/main.txt
index b28dbeaf96e..64212966878 100644
--- a/idea/testData/fir/lazyResolve/elvis/main.txt
+++ b/idea/testData/fir/lazyResolve/elvis/main.txt
@@ -1,14 +1,14 @@
 FILE: main.kt
     public final class WithElvis : R|kotlin/Any| {
-        public constructor(value: R|kotlin/String|?): R|elvis/WithElvis| {
+        public constructor(value: R|kotlin/String?|): R|elvis/WithElvis| {
             super<R|kotlin/Any|>()
         }
 
-        public final val value: R|kotlin/String|? = R|<local>/value|
-            public get(): R|kotlin/String|?
+        public final val value: R|kotlin/String?| = R|<local>/value|
+            public get(): R|kotlin/String?|
 
         public final fun foo(): R|kotlin/String| {
-            ^foo when (lval <elvis>: R|kotlin/String|? = R|elvis/WithElvis.value|) {
+            ^foo when (lval <elvis>: R|kotlin/String?| = R|elvis/WithElvis.value|) {
                 ==($subj$, Null(null)) ->  {
                     String()
                 }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
index 5740ad86a21..15a697bebe9 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
@@ -1,5 +1,5 @@
 public open class Annotated : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String|
 
     public constructor(): R|Annotated|
 
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
index 61e1902cfa6..4ff3debebc5 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
@@ -1,11 +1,11 @@
 public open class Annotated : R|kotlin/Any| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String?|): R|kotlin/String|
 
     public constructor(): R|Annotated|
 
 }
 public open class AnnotatedDerived : R|Annotated| {
-    public open operator fun foo(param: R|kotlin/String|?): R|kotlin/String|
+    public open operator fun foo(param: R|kotlin/String?|): R|kotlin/String|
 
     public constructor(): R|AnnotatedDerived|
 
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
index b1c1a707ec5..926f3c060be 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
@@ -1,5 +1,5 @@
 public open class A<T> : R|kotlin/Any| {
-    public open operator fun foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public open operator fun foo(t: R|ft<T, T?>!|): R|ft<T, T?>!|
 
     public constructor<T>(): R|A<T>|
 
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
index 38e6bef5b1e..76e8c3f9ee2 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/jvm/simpleFakeOverride.txt
@@ -11,7 +11,7 @@ FILE: simpleFakeOverride.kt
         }
 
         public final fun test(): R|kotlin/Unit| {
-            R|FakeOverride</A.foo: R|ft<Some, Some?>|!>|(R|/Some.Some|())
+            R|FakeOverride</A.foo: R|ft<Some, Some?>!|>|(R|/Some.Some|())
         }
 
     }
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
index 0478e3691f5..774b6b80464 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
@@ -1,7 +1,7 @@
 public open class Some : R|kotlin/Any| {
     public open operator fun foo(param: R|kotlin/Int|): R|kotlin/Boolean|
 
-    public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
+    public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|
 
     public constructor(): R|Some|
 
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
index a7486bbee6e..2c5769218f9 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/jvm/jvm.txt
@@ -7,7 +7,7 @@ FILE: jvm.kt
         public final fun test(): R|kotlin/Unit| {
             lval res1: R|kotlin/Boolean| = R|/Some.foo|(Int(1))
             lval res2: R|kotlin/Boolean| = R|/Some.foo|(Int(1).R|kotlin/Int.unaryMinus|())
-            lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|()))
+            lval res3: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>| = R|/Some.bar|(R|kotlin/intArrayOf|(Int(0), Int(2), Int(2).R|kotlin/Int.unaryMinus|()))
         }
 
     }
diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
index 3e8d9de1fbe..e4bce56b1bd 100644
--- a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
@@ -1,7 +1,7 @@
 public open class JavaClass : R|kotlin/Any| {
-    public open operator fun getText(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getText(): R|ft<kotlin/String, kotlin/String?>!|
 
-    public open operator fun getText(param: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getText(param: R|ft<kotlin/String, kotlin/String?>!|): R|ft<kotlin/String, kotlin/String?>!|
 
     public constructor(): R|JavaClass|
 
diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
index 1679a54e774..3ed448a15ad 100644
--- a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
+++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.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|ft<kotlin/String, 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|ft<kotlin/String, kotlin/String?>!| = R|<local>/jc|.R|/JavaClass.text|
     }
diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt
index 2b937491a51..7f467703940 100644
--- a/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaSyntheticProperty/extraDump.java.txt
@@ -1,5 +1,5 @@
 public/*package*/ open class JavaClass : R|kotlin/Any| {
-    public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getFoo(): R|ft<kotlin/String, kotlin/String?>!|
 
     public/*package*/ constructor(): R|JavaClass|
 
diff --git a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt
index 22654e15a95..a1567b6ddae 100644
--- a/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.txt
+++ b/idea/testData/fir/multiModule/javaSyntheticProperty/jvm/Test.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|ft<kotlin/String, kotlin/String?>!| = R|/JavaClass.JavaClass|().R|/JavaClass.foo|
+        public get(): R|ft<kotlin/String, kotlin/String?>!|
diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
index 681260b81dc..153477f16ea 100644
--- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
@@ -1,7 +1,7 @@
 public open class A : R|kotlin/Any| {
-    public open operator fun foo(): R|ft<A, A?>|!
+    public open operator fun foo(): R|ft<A, A?>!|
 
-    public open operator fun bar(): R|ft<A, A?>|!
+    public open operator fun bar(): R|ft<A, A?>!|
 
     public constructor(): R|A|