diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index a91fdd5c6a7..3621e23a323 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -21,7 +21,7 @@ public final class Array</*0*/ reified T> {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : T
     public final fun iterator() : jet.Iterator<T>
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : T) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : T) : jet.Unit
 }
 
 public final class Boolean {
@@ -39,7 +39,7 @@ public final class BooleanArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Boolean
     public final fun iterator() : jet.BooleanIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Boolean) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Boolean) : jet.Unit
 }
 
 public abstract class BooleanIterator : jet.Iterator<jet.Boolean> {
@@ -121,7 +121,7 @@ public final class ByteArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Byte
     public final fun iterator() : jet.ByteIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Byte) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Byte) : jet.Unit
 }
 
 public abstract class ByteIterator : jet.Iterator<jet.Byte> {
@@ -215,7 +215,7 @@ public final class CharArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Char
     public final fun iterator() : jet.CharIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Char) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Char) : jet.Unit
 }
 
 public abstract class CharIterator : jet.Iterator<jet.Char> {
@@ -340,7 +340,7 @@ public final class DoubleArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Double
     public final fun iterator() : jet.DoubleIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Double) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Double) : jet.Unit
 }
 
 public abstract class DoubleIterator : jet.Iterator<jet.Double> {
@@ -565,7 +565,7 @@ public final class FloatArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Float
     public final fun iterator() : jet.FloatIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Float) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Float) : jet.Unit
 }
 
 public abstract class FloatIterator : jet.Iterator<jet.Float> {
@@ -796,7 +796,7 @@ public final class IntArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Int
     public final fun iterator() : jet.IntIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Int) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Int) : jet.Unit
 }
 
 public abstract class IntIterator : jet.Iterator<jet.Int> {
@@ -943,7 +943,7 @@ public final class LongArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Long
     public final fun iterator() : jet.LongIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Long) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Long) : jet.Unit
 }
 
 public abstract class LongIterator : jet.Iterator<jet.Long> {
@@ -996,7 +996,7 @@ public trait Map</*0*/ K, /*1*/ out V> {
 public trait MutableCollection</*0*/ E> : jet.Collection<E>, jet.MutableIterable<E> {
     public abstract fun add(/*0*/ e : E) : jet.Boolean
     public abstract fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
-    public abstract fun clear() : Unit
+    public abstract fun clear() : jet.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
@@ -1018,15 +1018,15 @@ public trait MutableIterable</*0*/ out T> : jet.Iterable<T> {
 public trait MutableIterator</*0*/ out T> : jet.Iterator<T> {
     public abstract override /*1*/ /*fake_override*/ fun hasNext() : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun next() : T
-    public abstract fun remove() : Unit
+    public abstract fun remove() : jet.Unit
 }
 
 public trait MutableList</*0*/ E> : jet.List<E>, jet.MutableCollection<E> {
     public abstract override /*1*/ fun add(/*0*/ e : E) : jet.Boolean
-    public abstract fun add(/*0*/ index : jet.Int, /*1*/ element : E) : Unit
+    public abstract fun add(/*0*/ index : jet.Int, /*1*/ element : E) : jet.Unit
     public abstract override /*1*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
     public abstract fun addAll(/*0*/ index : jet.Int, /*1*/ c : jet.Collection<E>) : jet.Boolean
-    public abstract override /*1*/ fun clear() : Unit
+    public abstract override /*1*/ fun clear() : jet.Unit
     public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
     public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
     public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
@@ -1050,19 +1050,19 @@ public trait MutableList</*0*/ E> : jet.List<E>, jet.MutableCollection<E> {
 }
 
 public trait MutableListIterator</*0*/ T> : jet.ListIterator<T>, jet.MutableIterator<T> {
-    public abstract fun add(/*0*/ e : T) : Unit
+    public abstract fun add(/*0*/ e : T) : jet.Unit
     public abstract override /*2*/ fun hasNext() : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun hasPrevious() : jet.Boolean
     public abstract override /*2*/ fun next() : T
     public abstract override /*1*/ /*fake_override*/ fun nextIndex() : jet.Int
     public abstract override /*1*/ /*fake_override*/ fun previous() : T
     public abstract override /*1*/ /*fake_override*/ fun previousIndex() : jet.Int
-    public abstract override /*1*/ fun remove() : Unit
-    public abstract fun set(/*0*/ e : T) : Unit
+    public abstract override /*1*/ fun remove() : jet.Unit
+    public abstract fun set(/*0*/ e : T) : jet.Unit
 }
 
 public trait MutableMap</*0*/ K, /*1*/ V> : jet.Map<K, V> {
-    public abstract fun clear() : Unit
+    public abstract fun clear() : jet.Unit
     public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key : jet.Any?) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value : jet.Any?) : jet.Boolean
     public abstract override /*1*/ fun entrySet() : jet.MutableSet<jet.MutableMap.MutableEntry<K, V>>
@@ -1070,7 +1070,7 @@ public trait MutableMap</*0*/ K, /*1*/ V> : jet.Map<K, V> {
     public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
     public abstract override /*1*/ fun keySet() : jet.MutableSet<K>
     public abstract fun put(/*0*/ key : K, /*1*/ value : V) : V?
-    public abstract fun putAll(/*0*/ m : jet.Map<out K, V>) : Unit
+    public abstract fun putAll(/*0*/ m : jet.Map<out K, V>) : jet.Unit
     public abstract fun remove(/*0*/ key : jet.Any?) : V?
     public abstract override /*1*/ /*fake_override*/ fun size() : jet.Int
     public abstract override /*1*/ fun values() : jet.MutableCollection<V>
@@ -1087,7 +1087,7 @@ public trait MutableMap</*0*/ K, /*1*/ V> : jet.Map<K, V> {
 public trait MutableSet</*0*/ E> : jet.Set<E>, jet.MutableCollection<E> {
     public abstract override /*1*/ fun add(/*0*/ e : E) : jet.Boolean
     public abstract override /*1*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
-    public abstract override /*1*/ fun clear() : Unit
+    public abstract override /*1*/ fun clear() : jet.Unit
     public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
     public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
     public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other : jet.Any?) : jet.Boolean
@@ -1216,7 +1216,7 @@ public final class ShortArray {
     public final val size : jet.Int
     public final fun get(/*0*/ index : jet.Int) : jet.Short
     public final fun iterator() : jet.ShortIterator
-    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Short) : Unit
+    public final fun set(/*0*/ index : jet.Int, /*1*/ value : jet.Short) : jet.Unit
 }
 
 public abstract class ShortIterator : jet.Iterator<jet.Short> {
@@ -1262,7 +1262,7 @@ public open class Throwable {
     public constructor Throwable(/*0*/ message : jet.String? = ..., /*1*/ cause : jet.Throwable? = ...)
     public final fun getCause() : jet.Throwable?
     public final fun getMessage() : jet.String?
-    public final fun printStackTrace() : Unit
+    public final fun printStackTrace() : jet.Unit
 }
 
 public final class Unit {
@@ -1270,7 +1270,7 @@ public final class Unit {
     
     public class object <class-object-for-Unit> {
         private constructor <class-object-for-Unit>()
-        public final val VALUE : Unit
+        public final val VALUE : jet.Unit
     }
 }
 
diff --git a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
index dc5ebe0298f..dedb73fa3ba 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/InnerClassNameClash.txt
@@ -5,7 +5,7 @@ internal final class B {
     
     internal final class B {
         /*primary*/ public constructor B()
-        internal final fun foo(/*0*/ b : test.B.B.C) : Unit
+        internal final fun foo(/*0*/ b : test.B.B.C) : jet.Unit
         
         internal final class C {
             /*primary*/ public constructor C()
diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
index c808c706267..1342323b511 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
@@ -2,10 +2,10 @@ package test
 
 internal open class A {
     /*primary*/ public constructor A()
-    internal open fun foo(/*0*/ a : [ERROR : E]) : Unit
+    internal open fun foo(/*0*/ a : [ERROR : E]) : jet.Unit
 }
 
 internal final class B : test.A {
     /*primary*/ public constructor B()
-    internal open override /*1*/ fun foo(/*0*/ a : [ERROR : E]) : Unit
+    internal open override /*1*/ fun foo(/*0*/ a : [ERROR : E]) : jet.Unit
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
index 49510944fe5..7cdde581482 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
@@ -5,23 +5,23 @@ internal final class A {
 }
 
 package p {
-    internal fun foo() : Unit
-    internal fun foo(/*0*/ a : test.p.C) : Unit
+    internal fun foo() : jet.Unit
+    internal fun foo(/*0*/ a : test.p.C) : jet.Unit
     
     internal final class C {
         /*primary*/ public constructor C()
-        internal final fun f() : Unit
+        internal final fun f() : jet.Unit
     }
     
     internal open class G</*0*/ T> {
         /*primary*/ public constructor G</*0*/ T>()
-        internal final fun a() : Unit
+        internal final fun a() : jet.Unit
         internal open fun f() : T
     }
     
     internal final class G2</*0*/ E> : test.p.G<E> {
         /*primary*/ public constructor G2</*0*/ E>()
-        internal final override /*1*/ /*fake_override*/ fun a() : Unit
+        internal final override /*1*/ /*fake_override*/ fun a() : jet.Unit
         internal open override /*1*/ fun f() : E
         internal final fun g() : E
     }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
index 331b8349667..c512d8db4a5 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
@@ -2,5 +2,5 @@ package test
 
 public open class ProtectedPackageFun : java.lang.Object {
     public constructor ProtectedPackageFun()
-    protected/*protected and package*/ open fun foo() : Unit
+    protected/*protected and package*/ open fun foo() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
index eec7ebbeef2..78daada8fc3 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
@@ -5,10 +5,10 @@ public open class RawSuperType : java.lang.Object {
     
     public open inner class Derived : test.RawSuperType.Super<jet.Any?> {
         public constructor Derived()
-        public open override /*1*/ fun foo(/*0*/ p0 : jet.Any?) : Unit
+        public open override /*1*/ fun foo(/*0*/ p0 : jet.Any?) : jet.Unit
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T?) : Unit
+        public abstract fun foo(/*0*/ p0 : T?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
index 28ae83682c1..0d433743848 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
@@ -3,15 +3,15 @@ package test
 public trait TwoSuperclassesVarargAndNot : java.lang.Object {
     
     public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
-        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : Unit
+        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
     }
     
     public trait Super1 : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
     }
     
     public trait Super2 : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
index fa2c8e7e93e..a5e41dca5f0 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
@@ -5,15 +5,15 @@ public open class DeeplyInnerClass : java.lang.Object {
     
     public/*package*/ open inner class A : java.lang.Object {
         public/*package*/ constructor A()
-        public/*package*/ open fun a() : Unit
+        public/*package*/ open fun a() : jet.Unit
         
         public/*package*/ open inner class B : java.lang.Object {
             public/*package*/ constructor B()
-            public/*package*/ open fun b() : Unit
+            public/*package*/ open fun b() : jet.Unit
             
             public/*package*/ open inner class C : java.lang.Object {
                 public/*package*/ constructor C()
-                public/*package*/ open fun c() : Unit
+                public/*package*/ open fun c() : jet.Unit
             }
         }
     }
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index 28b1c534a06..20862b9235b 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -16,13 +16,13 @@ public final enum class Enum : jet.Enum<test.Enum> {
     
     public open inner class Inner : java.lang.Object {
         public constructor Inner()
-        public/*package*/ open fun bar() : Unit
-        public/*package*/ open fun valueOf(/*0*/ p0 : jet.String?) : Unit
+        public/*package*/ open fun bar() : jet.Unit
+        public/*package*/ open fun valueOf(/*0*/ p0 : jet.String?) : jet.Unit
     }
     
     public open class Nested : java.lang.Object {
         public constructor Nested()
-        public/*package*/ open fun foo() : Unit
-        public/*package*/ open fun values() : Unit
+        public/*package*/ open fun foo() : jet.Unit
+        public/*package*/ open fun values() : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
index 02ef7302cdf..f2c487c832a 100644
--- a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
@@ -5,11 +5,11 @@ public open class InnerClass : java.lang.Object {
     
     public open inner class Inner : java.lang.Object {
         public constructor Inner()
-        public open fun foo() : Unit
+        public open fun foo() : jet.Unit
     }
     
     public open class Nested : java.lang.Object {
         public constructor Nested()
-        public open fun bar() : Unit
+        public open fun bar() : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.txt b/compiler/testData/loadJava/compiledJava/static/Simple.txt
index ea597550d13..a190b9ed94c 100644
--- a/compiler/testData/loadJava/compiledJava/static/Simple.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Simple.txt
@@ -2,9 +2,9 @@ package test
 
 public open class Simple : java.lang.Object {
     public constructor Simple()
-    public open fun foo() : Unit
+    public open fun foo() : jet.Unit
 }
 
 package Simple {
-    public open fun bar() : Unit
+    public open fun bar() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index 0e87d4436a4..b75b34c6bea 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -16,7 +16,7 @@ public final enum class StaticMembersInEnum : jet.Enum<test.StaticMembersInEnum>
 package StaticMembersInEnum {
     public val CONSTANT : test.StaticMembersInEnum
     public var STATIC_FIELD : jet.Int
-    public open fun foo() : Unit
-    public open fun valueOf(/*0*/ p0 : jet.Int) : Unit
-    public open fun values(/*0*/ p0 : jet.Int) : Unit
+    public open fun foo() : jet.Unit
+    public open fun valueOf(/*0*/ p0 : jet.Int) : jet.Unit
+    public open fun values(/*0*/ p0 : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt
index 2185313442a..3273fc04723 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassDoesNotOverrideMethod.txt
@@ -14,13 +14,13 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     public open override /*1*/ /*fake_override*/ fun getTime() : jet.Long
     jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset() : jet.Int
     jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun getYear() : jet.Int
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0 : jet.Int) : Unit
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0 : jet.Int) : Unit
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0 : jet.Int) : Unit
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0 : jet.Int) : Unit
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0 : jet.Int) : Unit
-    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0 : jet.Long) : Unit
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0 : jet.Int) : Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0 : jet.Int) : jet.Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0 : jet.Int) : jet.Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0 : jet.Int) : jet.Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0 : jet.Int) : jet.Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0 : jet.Int) : jet.Unit
+    public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0 : jet.Long) : jet.Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0 : jet.Int) : jet.Unit
     jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun toGMTString() : jet.String
     jet.deprecated(value = "Deprecated in Java": jet.String) public open override /*1*/ /*fake_override*/ fun toLocaleString() : jet.String
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
index bc462400a3e..2fbf9556a72 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
@@ -5,6 +5,6 @@ public final class MethodReferencesOuterClassTP</*0*/ P> : java.lang.Object {
     
     public final inner class Inner : java.lang.Object {
         public constructor Inner()
-        public final fun </*0*/ Q : P> f() : Unit
+        public final fun </*0*/ Q : P> f() : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
index c68a1b9cadc..8702d5432c1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodTypePOneUpperBound : java.lang.Object {
     public constructor MethodTypePOneUpperBound()
-    public open fun </*0*/ T : java.lang.Cloneable?> bar() : Unit
+    public open fun </*0*/ T : java.lang.Cloneable?> bar() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
index 91f1b8e27ae..48d59d6f627 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodTypePTwoUpperBounds : java.lang.Object {
     public constructor MethodTypePTwoUpperBounds()
-    public open fun </*0*/ T> foo() : Unit where T : java.lang.Cloneable?, T : java.lang.Runnable?
+    public open fun </*0*/ T> foo() : jet.Unit where T : java.lang.Cloneable?, T : java.lang.Runnable?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
index 6abab460ce6..1d49fa2947a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
@@ -2,5 +2,5 @@ package test
 
 public final class MethodWithTypeP : java.lang.Object {
     public constructor MethodWithTypeP()
-    public final fun </*0*/ P> f() : Unit
+    public final fun </*0*/ P> f() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
index d00daebc40f..c8e93cb18c5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
@@ -2,5 +2,5 @@ package test
 
 public final class MethodWithTypePP : java.lang.Object {
     public constructor MethodWithTypePP()
-    public final fun </*0*/ P, /*1*/ Q : P> f() : Unit
+    public final fun </*0*/ P, /*1*/ Q : P> f() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
index ca2c1e7cda9..083db9f62d6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypePRefClassP</*0*/ P> : java.lang.Object {
     public constructor MethodWithTypePRefClassP</*0*/ P>()
-    public final fun </*0*/ Q : P> f() : Unit
+    public final fun </*0*/ Q : P> f() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
index 01a54af81d5..a78e07446e1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
@@ -2,5 +2,5 @@ package test
 
 public final class MethosWithPRefTP : java.lang.Object {
     public constructor MethosWithPRefTP()
-    public final fun </*0*/ P> f(/*0*/ p0 : P?) : Unit
+    public final fun </*0*/ P> f(/*0*/ p0 : P?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
index fee140c73c0..9bd3c213486 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
 public trait RemoveRedundantProjectionKind : java.lang.Object {
-    public abstract fun f(/*0*/ p0 : jet.Collection<jet.CharSequence?>?) : Unit
-    public abstract fun f(/*0*/ p0 : jet.Comparable<jet.CharSequence?>?) : Unit
+    public abstract fun f(/*0*/ p0 : jet.Collection<jet.CharSequence?>?) : jet.Unit
+    public abstract fun f(/*0*/ p0 : jet.Comparable<jet.CharSequence?>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
index 3bb78da66e9..dbaee832d56 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
@@ -2,5 +2,5 @@ package test
 
 public open class AnnotatedMethod : java.lang.Object {
     public constructor AnnotatedMethod()
-    jet.deprecated(value = "Deprecated in Java": jet.String) public open fun f() : Unit
+    jet.deprecated(value = "Deprecated in Java": jet.String) public open fun f() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
index 2cdd7671e79..657e6341124 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
@@ -3,5 +3,5 @@ package test
 public open class DifferentGetterAndSetter : java.lang.Object {
     public constructor DifferentGetterAndSetter()
     public open fun getSomething() : jet.Int
-    public open fun setSomething(/*0*/ p0 : jet.String?) : Unit
+    public open fun setSomething(/*0*/ p0 : jet.String?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
index edf5863bbd4..cdf8e48c437 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
@@ -3,5 +3,5 @@ package test
 public open class JavaBeanVar : java.lang.Object {
     public constructor JavaBeanVar()
     public open fun getColor() : jet.String?
-    public open fun setColor(/*0*/ p0 : jet.String?) : Unit
+    public open fun setColor(/*0*/ p0 : jet.String?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
index 3babfe72e7d..95d3986bb67 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
@@ -3,5 +3,5 @@ package test
 public open class JavaBeanVarOfGenericType</*0*/ P> : java.lang.Object {
     public constructor JavaBeanVarOfGenericType</*0*/ P>()
     public open fun getCharacters() : java.util.ArrayList<P>?
-    public open fun setCharacters(/*0*/ p0 : java.util.ArrayList<P>?) : Unit
+    public open fun setCharacters(/*0*/ p0 : java.util.ArrayList<P>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
index 7ca007e00a2..3c0f7fd7a74 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
@@ -2,6 +2,6 @@ package test
 
 public open class TwoSetters : java.lang.Object {
     public constructor TwoSetters()
-    public open fun setSize(/*0*/ p0 : jet.Int) : Unit
-    public open fun setSize(/*0*/ p0 : jet.String?) : Unit
+    public open fun setSize(/*0*/ p0 : jet.Int) : jet.Unit
+    public open fun setSize(/*0*/ p0 : jet.String?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
index 637c5dfdaa9..b359eefc1e4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithMappedClasses : java.lang.Object {
     public constructor MethodWithMappedClasses()
-    public open fun </*0*/ T> copy(/*0*/ p0 : jet.MutableList<in T>, /*1*/ p1 : jet.List<T>) : Unit
+    public open fun </*0*/ T> copy(/*0*/ p0 : jet.MutableList<in T>, /*1*/ p1 : jet.List<T>) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
index c84e685ad5b..e6ec4ed957c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypeParameters : java.lang.Object {
     public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A, /*1*/ p1 : jet.List<B>, /*2*/ p2 : jet.MutableList<in jet.String?>) : jet.Unit where B : java.lang.Runnable, B : jet.List<java.lang.Cloneable>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
index 86816733bd6..f8901ab9843 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithVararg : java.lang.Object {
     public constructor MethodWithVararg()
-    public open fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
+    public open fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
index a7e2f429fc1..743cbaa5d6b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class ConflictingProjectionKind : java.lang.Object {
     public constructor ConflictingProjectionKind()
-    public open fun foo(/*0*/ p0 : jet.List<jet.Number>?) : Unit
+    public open fun foo(/*0*/ p0 : jet.List<jet.Number>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index e2df4ef3508..ec40bc601ee 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotVarargReplacedWithVararg : java.lang.Object {
     public constructor NotVarargReplacedWithVararg()
-    public open fun foo(/*0*/ p0 : jet.String?) : Unit
+    public open fun foo(/*0*/ p0 : jet.String?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
index 3cf7a00a492..3b37f0b5b4b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class RedundantProjectionKind : java.lang.Object {
     public constructor RedundantProjectionKind()
-    public open fun foo(/*0*/ p0 : jet.List<jet.Number>) : Unit
+    public open fun foo(/*0*/ p0 : jet.List<jet.Number>) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index 2fdf31155b7..ba590879494 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -2,5 +2,5 @@ package test
 
 public open class VarargReplacedWithNotVararg : java.lang.Object {
     public constructor VarargReplacedWithNotVararg()
-    public open fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+    public open fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 7149daaa520..f47a77a6337 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
     public constructor WrongTypeParameterBoundStructure1()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : jet.Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index 61c88c83124..6d992fdb635 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
     public constructor WrongTypeParameterBoundStructure2()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : jet.Unit where B : java.lang.Runnable?, B : jet.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
index 6312716471c..8dbfd50f1f7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParametersCount : java.lang.Object {
     public constructor WrongTypeParametersCount()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : Unit
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0 : A?, /*1*/ p1 : jet.List<B>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index 8dab2a9005a..fc5bcc19e23 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -4,19 +4,19 @@ public trait PropagateTypeArgumentNullable : java.lang.Object {
     
     public trait Sub : test.PropagateTypeArgumentNullable.Super {
         public abstract override /*1*/ fun invOutR() : jet.MutableList<jet.List<jet.String?>>
-        public abstract override /*1*/ fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : jet.Unit
         public abstract override /*1*/ fun invR() : jet.MutableList<jet.String?>
-        public abstract override /*1*/ fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract override /*1*/ fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : jet.Unit
         public abstract override /*1*/ fun outR() : jet.List<jet.String?>
-        public abstract override /*1*/ fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
+        public abstract override /*1*/ fun outS(/*0*/ p0 : jet.List<jet.String?>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
         public abstract fun invOutR() : jet.MutableList<jet.List<jet.String?>>
-        public abstract fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : Unit
+        public abstract fun invOutS(/*0*/ p0 : jet.MutableList<jet.List<jet.String?>>) : jet.Unit
         public abstract fun invR() : jet.MutableList<jet.String?>
-        public abstract fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : Unit
+        public abstract fun outOutS(/*0*/ p0 : jet.List<jet.List<jet.String?>>) : jet.Unit
         public abstract fun outR() : jet.List<jet.String?>
-        public abstract fun outS(/*0*/ p0 : jet.List<jet.String?>) : Unit
+        public abstract fun outS(/*0*/ p0 : jet.List<jet.String?>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index b3fbe5e292c..f97d041ffd0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -3,10 +3,10 @@ package test
 public trait ChangeProjectionKind1 : java.lang.Object {
     
     public trait Sub : test.ChangeProjectionKind1.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
index b9fa8af483a..84482aa6d9c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
@@ -3,10 +3,10 @@ package test
 public trait ChangeProjectionKind2 : java.lang.Object {
     
     public trait Sub : test.ChangeProjectionKind2.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
index 0718e6aa75e..9421966b76e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
@@ -3,14 +3,14 @@ package test
 public trait DeeplySubstitutedClassParameter : java.lang.Object {
     
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : E) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : E) : jet.Unit
     }
     
     public trait Sub : test.DeeplySubstitutedClassParameter.Middle<jet.String> {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T) : Unit
+        public abstract fun foo(/*0*/ p0 : T) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
index 2be57177a33..2cf6009f054 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
@@ -3,14 +3,14 @@ package test
 public trait DeeplySubstitutedClassParameter2 : java.lang.Object {
     
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
-        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0 : E) : Unit
+        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0 : E) : jet.Unit
     }
     
     public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<jet.String> {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T) : Unit
+        public abstract fun foo(/*0*/ p0 : T) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
index af865898d6e..0d2cda78c15 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritMutability : java.lang.Object {
     
     public trait Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index aa854be6e91..13fb2a0c2e8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNotVararg : java.lang.Object {
     
     public trait Sub : test.InheritNotVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 831c0e8befd..4b42f5ad4fb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNotVarargInteger : java.lang.Object {
     
     public trait Sub : test.InheritNotVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.Int>?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
index 3a0c1b046f9..0b687dba8e8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNotVarargNotNull : java.lang.Object {
     
     public trait Sub : test.InheritNotVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index eaa59618308..dd0bdbec6fe 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNotVarargPrimitive : java.lang.Object {
     
     public trait Sub : test.InheritNotVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.IntArray?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.IntArray?) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.IntArray?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.IntArray?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
index 2ceb99b8802..35ee94b31a1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNullability : java.lang.Object {
     
     public trait Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
index 9627bbaf119..37f82ba4639 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritProjectionKind : java.lang.Object {
     
     public trait Sub : test.InheritProjectionKind.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<in jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
index 5b4e4c0dc2a..0d0ecb37765 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritReadOnliness : java.lang.Object {
     
     public trait Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
index 486c4a6592a..1b119110092 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritVararg : java.lang.Object {
     
     public trait Sub : test.InheritVararg.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+        public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
index 6c30f2722df..ad4e22f5db1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritVarargInteger : java.lang.Object {
     
     public trait Sub : test.InheritVarargInteger.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : Unit
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int? /*jet.Array<jet.Int?>*/) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
index ce508a57bfd..c119dde49a3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritVarargNotNull : java.lang.Object {
     
     public trait Sub : test.InheritVarargNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : Unit
+        public abstract fun foo(/*0*/ vararg p0 : jet.String /*jet.Array<jet.String>*/) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
index 0985824bb06..39dbc07e64e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritVarargPrimitive : java.lang.Object {
     
     public trait Sub : test.InheritVarargPrimitive.Super {
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
+        public abstract fun foo(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index 6c73a6f9080..506f530af3e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -3,10 +3,10 @@ package test
 public trait MutableToReadOnly : java.lang.Object {
     
     public trait Sub : test.MutableToReadOnly.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.MutableList<jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
index a6cb26255ff..c9ac7d42c53 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
@@ -3,10 +3,10 @@ package test
 public trait NotNullToNullable : java.lang.Object {
     
     public trait Sub : test.NotNullToNullable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index 68f376baadf..043d0e3df5a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -3,10 +3,10 @@ package test
 public trait NullableToNotNull : java.lang.Object {
     
     public trait Sub : test.NullableToNotNull.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.String?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index 2cc05ad8501..e43fe03aa5f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -3,10 +3,10 @@ package test
 public trait NullableToNotNullKotlinSignature : java.lang.Object {
     
     public trait Sub : test.NullableToNotNullKotlinSignature.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String?) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.String?) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.String?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
index 19e2d5e2b35..563398031bb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
@@ -3,10 +3,10 @@ package test
 public trait OverrideWithErasedParameter : java.lang.Object {
     
     public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : T?) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : T?) : jet.Unit
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T?) : Unit
+        public abstract fun foo(/*0*/ p0 : T?) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index 6a8b29f7fcf..140f43b0d4f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -3,10 +3,10 @@ package test
 public trait ReadOnlyToMutable : java.lang.Object {
     
     public trait Sub : test.ReadOnlyToMutable.Super {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.List<jet.String>) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.List<jet.String>) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
index a59565a9354..8e64d247aac 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
@@ -3,14 +3,14 @@ package test
 public trait SubclassFromGenericAndNot : java.lang.Object {
     
     public trait Generic</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T) : Unit
+        public abstract fun foo(/*0*/ p0 : T) : jet.Unit
     }
     
     public trait NonGeneric : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<jet.String> {
-        public abstract override /*2*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*2*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
index 412baafb381..2337b03db1c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
@@ -3,10 +3,10 @@ package test
 public trait SubstitutedClassParameter : java.lang.Object {
     
     public trait Sub : test.SubstitutedClassParameter.Super<jet.String> {
-        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T) : Unit
+        public abstract fun foo(/*0*/ p0 : T) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
index f3bc4567592..c732eee0158 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
@@ -3,14 +3,14 @@ package test
 public trait SubstitutedClassParameters : java.lang.Object {
     
     public trait Sub : test.SubstitutedClassParameters.Super1<jet.String>, test.SubstitutedClassParameters.Super2<jet.String> {
-        public abstract override /*2*/ fun foo(/*0*/ p0 : jet.String) : Unit
+        public abstract override /*2*/ fun foo(/*0*/ p0 : jet.String) : jet.Unit
     }
     
     public trait Super1</*0*/ T> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : T) : Unit
+        public abstract fun foo(/*0*/ p0 : T) : jet.Unit
     }
     
     public trait Super2</*0*/ E> : java.lang.Object {
-        public abstract fun foo(/*0*/ p0 : E) : Unit
+        public abstract fun foo(/*0*/ p0 : E) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 65db36def71..fe3914eb1f0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -12,10 +12,10 @@ public trait HalfSubstitutedTypeParameters : java.lang.Object {
     
     public trait TrickyList</*0*/ X, /*1*/ E> : jet.MutableList<E> {
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index : jet.Int, /*1*/ element : E) : Unit
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index : jet.Int, /*1*/ element : E) : jet.Unit
         public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
         public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index : jet.Int, /*1*/ c : jet.Collection<E>) : jet.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+        public abstract override /*1*/ /*fake_override*/ fun clear() : jet.Unit
         public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
         public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index : jet.Int) : E
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt
index 589d71facfe..9d745e3035d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -3,7 +3,7 @@ package test
 public trait SubclassOfCollection</*0*/ E> : jet.MutableCollection<E> {
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e : E) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c : jet.Collection<E>) : jet.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun clear() : Unit
+    public abstract override /*1*/ /*fake_override*/ fun clear() : jet.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o : jet.Any?) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c : jet.Collection<jet.Any?>) : jet.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty() : jet.Boolean
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index c75f5fda5f3..a3f8cfc1e81 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritMutability : java.lang.Object {
     
     public trait Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>> foo(/*0*/ p0 : B) : Unit
+        public abstract override /*1*/ fun </*0*/ B : jet.MutableList<jet.String>> foo(/*0*/ p0 : B) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.MutableList<jet.String>> foo(/*0*/ p0 : A) : Unit
+        public abstract fun </*0*/ A : jet.MutableList<jet.String>> foo(/*0*/ p0 : A) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
index 956581c86b9..d47bb9d838c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNullability : java.lang.Object {
     
     public trait Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index aaf746c615d..a1139a70830 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritReadOnliness : java.lang.Object {
     
     public trait Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>> foo(/*0*/ p0 : B) : Unit
+        public abstract override /*1*/ fun </*0*/ B : jet.List<jet.String>> foo(/*0*/ p0 : B) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.List<jet.String>> foo(/*0*/ p0 : A) : Unit
+        public abstract fun </*0*/ A : jet.List<jet.String>> foo(/*0*/ p0 : A) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
index 5cce855ca7a..96441c67777 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
@@ -3,10 +3,10 @@ package test
 public trait TwoBounds : java.lang.Object {
     
     public trait Sub : test.TwoBounds.Super {
-        public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : Unit where B : jet.CharSequence, B : java.lang.Cloneable
+        public abstract override /*1*/ fun </*0*/ B> foo(/*0*/ p0 : B) : jet.Unit where B : jet.CharSequence, B : java.lang.Cloneable
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : Unit where A : jet.CharSequence, A : java.lang.Cloneable
+        public abstract fun </*0*/ A> foo(/*0*/ p0 : A) : jet.Unit where A : jet.CharSequence, A : java.lang.Cloneable
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
index 8a90dc56241..823416b3bdb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
@@ -3,14 +3,14 @@ package test
 public trait TwoSuperclasses : java.lang.Object {
     
     public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
-        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence> foo(/*0*/ p0 : C) : Unit
+        public abstract override /*2*/ fun </*0*/ C : jet.CharSequence> foo(/*0*/ p0 : C) : jet.Unit
     }
     
     public trait Super1 : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : Unit
+        public abstract fun </*0*/ A : jet.CharSequence> foo(/*0*/ p0 : A) : jet.Unit
     }
     
     public trait Super2 : java.lang.Object {
-        public abstract fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : Unit
+        public abstract fun </*0*/ B : jet.CharSequence> foo(/*0*/ p0 : B) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
index 5e6769ce183..8282e2dbad9 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
@@ -3,10 +3,10 @@ package test
 public trait TwoTypeParameters : java.lang.Object {
     
     public trait Sub : test.TwoTypeParameters.Super {
-        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
+        public abstract override /*1*/ fun </*0*/ B : jet.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ p0 : B, /*1*/ p1 : A) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
+        public abstract fun </*0*/ A : jet.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ p0 : A, /*1*/ p1 : B) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
index 0ce07c4a285..741b0141f60 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterAsUpperBound : java.lang.Object {
     
     public trait Sub : test.UseParameterAsUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ p0 : B, /*1*/ p1 : A) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
+        public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ p0 : A, /*1*/ p1 : B) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index 25eabaee791..fdc19c4c898 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterInUpperBound : java.lang.Object {
     
     public trait Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index 9f0e2aef545..27c851524cd 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
     
     public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : jet.List<B>> foo(/*0*/ p0 : B, /*1*/ p1 : A) : jet.Unit
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : Unit
+        public abstract fun </*0*/ A, /*1*/ B : jet.List<A>> foo(/*0*/ p0 : A, /*1*/ p1 : B) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
index e54c31edd01..809ef3cc068 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
@@ -2,5 +2,5 @@ package test
 
 public trait LoadIterable</*0*/ T> : java.lang.Object {
     public abstract fun getIterable() : jet.MutableIterable<T>?
-    public abstract fun setIterable(/*0*/ p0 : jet.Iterable<T>?) : Unit
+    public abstract fun setIterable(/*0*/ p0 : jet.Iterable<T>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
index 32f14eeed74..05099420f82 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
@@ -2,5 +2,5 @@ package test
 
 public trait LoadIterator</*0*/ T> : java.lang.Object {
     public abstract fun getIterator() : jet.MutableIterator<T>?
-    public abstract fun setIterator(/*0*/ p0 : jet.Iterator<T>?) : Unit
+    public abstract fun setIterator(/*0*/ p0 : jet.Iterator<T>?) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt
index 501634870f7..fce1da2cc2f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/modality/ModalityOfFakeOverrides.txt
@@ -3,11 +3,11 @@ package test
 public open class ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
     public constructor ModalityOfFakeOverrides()
     protected final override /*1*/ /*fake_override*/ var modCount : jet.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.String) : Unit
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.String) : jet.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0 : jet.String) : jet.Boolean
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0 : jet.Collection<jet.String>) : jet.Boolean
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Collection<jet.String>) : jet.Boolean
-    public open override /*1*/ /*fake_override*/ fun clear() : Unit
+    public open override /*1*/ /*fake_override*/ fun clear() : jet.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0 : jet.Any?) : jet.Boolean
     public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
     public open override /*1*/ fun get(/*0*/ p0 : jet.Int) : jet.String
@@ -20,7 +20,7 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0 : jet.Any?) : jet.Boolean
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0 : jet.Int) : jet.String
     public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
-    protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int) : Unit
+    protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.Int) : jet.Unit
     public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0 : jet.Collection<jet.Any?>) : jet.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0 : jet.Int, /*1*/ p1 : jet.String) : jet.String
     public open override /*1*/ fun size() : jet.Int
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
index a06aa180c7d..54f17142c99 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
@@ -2,5 +2,5 @@ package test
 
 public open class NotNullParameter : java.lang.Object {
     public constructor NotNullParameter()
-    public open fun hi(/*0*/ p0 : jet.String) : Unit
+    public open fun hi(/*0*/ p0 : jet.String) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
index 84f5a5df147..1b7656b2b36 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
@@ -2,5 +2,5 @@ package test
 
 public open class VarargInt : java.lang.Object {
     public constructor VarargInt()
-    public open fun vararg(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : Unit
+    public open fun vararg(/*0*/ vararg p0 : jet.Int /*jet.IntArray*/) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
index 6edd2fc9888..83e22f11c45 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
@@ -2,5 +2,5 @@ package test
 
 public open class VarargString : java.lang.Object {
     public constructor VarargString()
-    public open fun vararg(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : Unit
+    public open fun vararg(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
 }
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
index fb683741e3e..0c80a846d5c 100644
--- a/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
+++ b/compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
@@ -2,10 +2,10 @@ package test
 
 public open class Base : java.lang.Object {
     public constructor Base()
-    public/*package*/ open fun foo() : Unit
+    public/*package*/ open fun foo() : jet.Unit
 }
 
 internal final class Derived : test.Base {
     public constructor Derived()
-    internal open override /*1*/ fun foo() : Unit
+    internal open override /*1*/ fun foo() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt b/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt
index 0bf8f8cbb53..7f8b5345bda 100644
--- a/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt
+++ b/compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt
@@ -2,10 +2,10 @@ package test
 
 public open class Base : java.lang.Object {
     public constructor Base()
-    protected/*protected and package*/ open fun foo() : Unit
+    protected/*protected and package*/ open fun foo() : jet.Unit
 }
 
 internal final class Derived : test.Base {
     public constructor Derived()
-    protected open override /*1*/ fun foo() : Unit
+    protected open override /*1*/ fun foo() : jet.Unit
 }
diff --git a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
index ba986fa307a..3c8a50fb868 100644
--- a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
+++ b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
@@ -3,13 +3,13 @@ package test
 public trait ErrorTypes : java.lang.Object {
     
     public trait Sub : test.ErrorTypes.Super {
-        public abstract fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : Unit
-        public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : Unit
+        public abstract fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : jet.Unit
+        public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : jet.Unit
         public abstract override /*1*/ fun returnErrorType() : [ERROR : Unresolved java class: T]
     }
     
     public trait Super : java.lang.Object {
-        public abstract fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : Unit
+        public abstract fun errorTypeInParameter(/*0*/ list : jet.List<jet.Array<[ERROR : Unresolved java class: T]>?>?) : jet.Unit
         public abstract fun returnErrorType() : [ERROR : Unresolved java class: T]
     }
 }
diff --git a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
index 1883e6beb53..19da6f12d8a 100644
--- a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
+++ b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
@@ -6,13 +6,13 @@ public trait ReturnNotSubtype : java.lang.Object {
         public abstract override /*1*/ fun _void() : jet.Boolean
         public abstract override /*1*/ fun array() : jet.Array<java.lang.Void>?
         public abstract override /*1*/ fun klass() : java.lang.Class<out jet.Any?>?
-        public abstract override /*1*/ fun string1() : Unit
+        public abstract override /*1*/ fun string1() : jet.Unit
         public abstract override /*1*/ fun string2() : jet.MutableList<jet.Boolean>?
         public abstract override /*1*/ fun t() : java.lang.Void?
     }
     
     public trait Super</*0*/ T> : java.lang.Object {
-        public abstract fun _void() : Unit
+        public abstract fun _void() : jet.Unit
         public abstract fun array() : jet.Array<T>?
         public abstract fun klass() : java.lang.Class<out jet.CharSequence?>?
         public abstract fun string1() : jet.String?
diff --git a/compiler/testData/loadKotlin/constructor/vararg/ConstructorNonLastVararg.txt b/compiler/testData/loadKotlin/constructor/vararg/ConstructorNonLastVararg.txt
index 024a6e73bad..02a73d15b14 100644
--- a/compiler/testData/loadKotlin/constructor/vararg/ConstructorNonLastVararg.txt
+++ b/compiler/testData/loadKotlin/constructor/vararg/ConstructorNonLastVararg.txt
@@ -1,5 +1,5 @@
 package test
 
 internal final class A {
-    /*primary*/ public constructor A(/*0*/ vararg a : jet.Int /*jet.IntArray*/, /*1*/ f : () -> Unit)
+    /*primary*/ public constructor A(/*0*/ vararg a : jet.Int /*jet.IntArray*/, /*1*/ f : () -> jet.Unit)
 }
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index b76ba474dfd..79ffef7f4fa 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -1,6 +1,6 @@
 package test
 
-internal fun </*0*/ T> foo() : Unit where T : test.Foo, T : test.Bar
+internal fun </*0*/ T> foo() : jet.Unit where T : test.Foo, T : test.Bar
 
 internal trait Bar {
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
index 4c1b09676a8..142affa7967 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -3,5 +3,5 @@ package test
 internal final class ClassFunGetFoo {
     /*primary*/ public constructor ClassFunGetFoo()
     internal final fun getFoo() : jet.Int
-    internal final fun setFoo(/*0*/ p : jet.Int) : Unit
+    internal final fun setFoo(/*0*/ p : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
index 21c48167279..d4ed51c14a2 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
@@ -2,5 +2,5 @@ package test
 
 internal final class ClassFunGetFoo {
     /*primary*/ public constructor ClassFunGetFoo()
-    internal final fun set(/*0*/ p : jet.Int) : Unit
+    internal final fun set(/*0*/ p : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/fun/vararg/nonLastVararg.txt b/compiler/testData/loadKotlin/fun/vararg/nonLastVararg.txt
index 189d72e9b05..05ab70d69ad 100644
--- a/compiler/testData/loadKotlin/fun/vararg/nonLastVararg.txt
+++ b/compiler/testData/loadKotlin/fun/vararg/nonLastVararg.txt
@@ -1,4 +1,4 @@
 package test
 
-internal fun f(/*0*/ vararg t : jet.String /*jet.Array<jet.String>*/, /*1*/ f : () -> Unit) : Unit
-internal fun f(/*0*/ vararg t : jet.Int /*jet.IntArray*/, /*1*/ f : () -> Unit) : Unit
+internal fun f(/*0*/ vararg t : jet.String /*jet.Array<jet.String>*/, /*1*/ f : () -> jet.Unit) : jet.Unit
+internal fun f(/*0*/ vararg t : jet.Int /*jet.IntArray*/, /*1*/ f : () -> jet.Unit) : jet.Unit
diff --git a/compiler/testData/loadKotlin/type/Unit.txt b/compiler/testData/loadKotlin/type/Unit.txt
index 1c7ce82d1dc..70a3a9e45df 100644
--- a/compiler/testData/loadKotlin/type/Unit.txt
+++ b/compiler/testData/loadKotlin/type/Unit.txt
@@ -1,3 +1,3 @@
 package test
 
-internal fun unit() : Unit
+internal fun unit() : jet.Unit
diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt
index a49fe87ad17..b2887cf53d6 100644
--- a/compiler/testData/renderer/Classes.kt
+++ b/compiler/testData/renderer/Classes.kt
@@ -37,13 +37,13 @@ public trait TwoUpperBounds<T> where T: Number, T: Any
 //<X> defined in rendererTest.TheClass
 //private final val privateVal : jet.Int defined in rendererTest.TheClass
 //internal final val shouldBeFinal : jet.Int defined in rendererTest.TheClass
-//protected abstract fun foo() : Unit defined in rendererTest.TheClass
+//protected abstract fun foo() : jet.Unit defined in rendererTest.TheClass
 //private final class Inner defined in rendererTest.TheClass
 //public constructor Inner() defined in rendererTest.TheClass.Inner
 //internal final class InternalClass defined in rendererTest
 //public constructor InternalClass() defined in rendererTest.InternalClass
 //internal trait TheTrait defined in rendererTest
-//internal abstract fun abstractFun() : Unit defined in rendererTest.TheTrait
+//internal abstract fun abstractFun() : jet.Unit defined in rendererTest.TheTrait
 //internal class object : rendererTest.TheClass<jet.Int, jet.Int> defined in rendererTest.TheTrait
 //private constructor <class-object-for-TheTrait>() defined in rendererTest.TheTrait.<class-object-for-TheTrait>
 //internal final fun classObjectFunction() : jet.Int defined in rendererTest.TheTrait.<class-object-for-TheTrait>
diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt
index e511aeb13dd..62cbbe15dd7 100644
--- a/compiler/testData/renderer/FunctionTypes.kt
+++ b/compiler/testData/renderer/FunctionTypes.kt
@@ -8,11 +8,11 @@ var v6  : Int.(String, Int) -> Unit
 var v7  : ExtensionFunction1<Int, String, Boolean>
 
 
-//internal var v1 : () -> Unit defined in root package
+//internal var v1 : () -> jet.Unit defined in root package
 //internal var v2 : (jet.Int) -> jet.Int defined in root package
 //internal var v3 : (jet.Int, jet.String) -> jet.String defined in root package
 //internal var v4 : (jet.Int) -> jet.String defined in root package
-//internal var v4 : (() -> jet.Int, (jet.String) -> Unit) -> jet.String defined in root package
+//internal var v4 : (() -> jet.Int, (jet.String) -> jet.Unit) -> jet.String defined in root package
 //internal var v5 : jet.Int.() -> jet.Int defined in root package
-//internal var v6 : jet.Int.(jet.String, jet.Int) -> Unit defined in root package
+//internal var v6 : jet.Int.(jet.String, jet.Int) -> jet.Unit defined in root package
 //internal var v7 : jet.Int.(jet.String) -> jet.Boolean defined in root package
diff --git a/compiler/testData/renderer/GlobalFunctions.kt b/compiler/testData/renderer/GlobalFunctions.kt
index 88de33deb0b..d44853b5644 100644
--- a/compiler/testData/renderer/GlobalFunctions.kt
+++ b/compiler/testData/renderer/GlobalFunctions.kt
@@ -20,7 +20,7 @@ fun <P> funTypeParameterWithTwoUpperBounds() where P : Foo, P : Bar = 17
 deprecated("") fun deprecatedFun()
 
 //package rendererTest defined in root package
-//public fun pub() : Unit defined in rendererTest
+//public fun pub() : jet.Unit defined in rendererTest
 //internal fun int() : jet.String defined in rendererTest
 //internal fun int2(vararg ints : jet.Int) : jet.Int defined in rendererTest
 //value-parameter vararg val ints : jet.Int defined in rendererTest.int2
@@ -35,4 +35,4 @@ deprecated("") fun deprecatedFun()
 //internal trait Bar defined in rendererTest
 //internal fun <P> funTypeParameterWithTwoUpperBounds() : jet.Int where P : rendererTest.Foo, P : rendererTest.Bar defined in rendererTest
 //<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
-//jet.deprecated internal fun deprecatedFun() : Unit defined in rendererTest
+//jet.deprecated internal fun deprecatedFun() : jet.Unit defined in rendererTest
diff --git a/compiler/testData/renderer/InheritedMembersVisibility.kt b/compiler/testData/renderer/InheritedMembersVisibility.kt
index e28371413f6..3541cefad89 100644
--- a/compiler/testData/renderer/InheritedMembersVisibility.kt
+++ b/compiler/testData/renderer/InheritedMembersVisibility.kt
@@ -18,13 +18,13 @@ class B : A {
 //internal trait A defined in root package
 //internal abstract val v : jet.Int defined in A
 //public abstract var int : jet.Int defined in A
-//private abstract fun <set-int>(<set-?> : jet.Int) : Unit defined in A
+//private abstract fun <set-int>(<set-?> : jet.Int) : jet.Unit defined in A
 //protected abstract fun f() : jet.Int defined in A
 //internal final class B : A defined in root package
 //public constructor B() defined in B
 //public open var int : jet.Int defined in B
 //public open fun <get-int>() : jet.Int defined in B
-//private open fun <set-int>(<set-?> : jet.Int) : Unit defined in B
+//private open fun <set-int>(<set-?> : jet.Int) : jet.Unit defined in B
 //protected open fun f() : jet.Int defined in B
 //internal open val v : jet.Int defined in B
 //internal open fun <get-v>() : jet.Int defined in B
\ No newline at end of file
diff --git a/compiler/testData/renderer/UnitType.kt b/compiler/testData/renderer/UnitType.kt
index a24ba3725a4..c0c70b9622c 100644
--- a/compiler/testData/renderer/UnitType.kt
+++ b/compiler/testData/renderer/UnitType.kt
@@ -1,5 +1,5 @@
 var v1 : Unit
 var v2 : Unit?
 
-//internal var v1 : Unit defined in root package
-//internal var v2 : Unit? defined in root package
+//internal var v1 : jet.Unit defined in root package
+//internal var v2 : jet.Unit? defined in root package
diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html
index d4856e6bdf5..a18dcae0191 100644
--- a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html
+++ b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html
@@ -20,7 +20,7 @@ t : T</td>
 <td style="white-space:nowrap;font-weight:bold;">
 )</td>
 <td style="white-space:nowrap;font-weight:bold;">
- : Unit <b>
+ : jet.Unit <b>
 where</b>
  E : java.lang.Cloneable, E : java.io.Closeable</td>
 </tr>
diff --git a/idea/testData/diagnosticMessage/upperBoundViolated1.html b/idea/testData/diagnosticMessage/upperBoundViolated1.html
index 10361c3074d..096ff9ff54d 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolated1.html
+++ b/idea/testData/diagnosticMessage/upperBoundViolated1.html
@@ -20,7 +20,7 @@ list : T</td>
 <td style="white-space:nowrap;font-weight:bold;">
 )</td>
 <td style="white-space:nowrap;font-weight:bold;">
- : Unit</td>
+ : jet.Unit</td>
 </tr>
 </table>
  is not satisfied: inferred type <font color=red>
diff --git a/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt b/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt
index 675030e7e7b..7572f112f4d 100644
--- a/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt
+++ b/idea/testData/libraries/decompiled/ClassWithAbstractAndOpenMembers.kt
@@ -16,7 +16,7 @@ package testData.libraries
 
     [public open var openVarWithGetter : jet.String] /* compiled code */
 
-    [public abstract fun abstractFun() : Unit]
+    [public abstract fun abstractFun() : jet.Unit]
 
-    [public open fun openFun() : Unit { /* compiled code */ }]
+    [public open fun openFun() : jet.Unit { /* compiled code */ }]
 }]]
diff --git a/idea/testData/libraries/decompiled/LibrariesPackage.kt b/idea/testData/libraries/decompiled/LibrariesPackage.kt
index 34e6e9e1294..0e4546a2ac4 100644
--- a/idea/testData/libraries/decompiled/LibrariesPackage.kt
+++ b/idea/testData/libraries/decompiled/LibrariesPackage.kt
@@ -13,24 +13,24 @@ package testData.libraries
 
 [public val <T> testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
 
-[public fun <T : jet.CharSequence> funWithTypeParam(t : T) : Unit { /* compiled code */ }]
+[public fun <T : jet.CharSequence> funWithTypeParam(t : T) : jet.Unit { /* compiled code */ }]
 
-[public fun <T : jet.Number> funWithTypeParam(t : T) : Unit { /* compiled code */ }]
+[public fun <T : jet.Number> funWithTypeParam(t : T) : jet.Unit { /* compiled code */ }]
 
-[public fun func() : Unit { /* compiled code */ }]
+[public fun func() : jet.Unit { /* compiled code */ }]
 
-[public fun func(cs : jet.CharSequence) : Unit { /* compiled code */ }]
+[public fun func(cs : jet.CharSequence) : jet.Unit { /* compiled code */ }]
 
-[public fun func(a : jet.Int, b : jet.Int) : Unit { /* compiled code */ }]
+[public fun func(a : jet.Int, b : jet.Int) : jet.Unit { /* compiled code */ }]
 
-[public fun func(a : jet.Int, b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
+[public fun func(a : jet.Int, b : jet.String = /* compiled code */) : jet.Unit { /* compiled code */ }]
 
-[public fun func(str : jet.String) : Unit { /* compiled code */ }]
+[public fun func(str : jet.String) : jet.Unit { /* compiled code */ }]
 
-[public fun main(args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
+[public fun main(args : jet.Array<jet.String>) : jet.Unit { /* compiled code */ }]
 
-[public fun processDouble(d : jet.Double) : Unit { /* compiled code */ }]
+[public fun processDouble(d : jet.Double) : jet.Unit { /* compiled code */ }]
 
-[public fun processDouble(d : testData.libraries.Double) : Unit { /* compiled code */ }]
+[public fun processDouble(d : testData.libraries.Double) : jet.Unit { /* compiled code */ }]
 
 [public fun <T> T.filter(predicate : (T) -> jet.Boolean) : T? { /* compiled code */ }]
\ No newline at end of file
diff --git a/idea/testData/libraries/decompiled/WithInnerAndObject.kt b/idea/testData/libraries/decompiled/WithInnerAndObject.kt
index 5e348d5c960..c2fc82de454 100644
--- a/idea/testData/libraries/decompiled/WithInnerAndObject.kt
+++ b/idea/testData/libraries/decompiled/WithInnerAndObject.kt
@@ -5,12 +5,12 @@ package testData.libraries
 
 [[public final class WithInnerAndObject() {
     public class object {
-        [internal final fun foo() : Unit { /* compiled code */ }]
+        [internal final fun foo() : jet.Unit { /* compiled code */ }]
     }
 
     [[internal final class MyInner() {
         [internal trait MyInnerInner {
-            [internal abstract fun innerInnerMethod() : Unit]
+            [internal abstract fun innerInnerMethod() : jet.Unit]
         }]
     }]]
 }]]