From d0e736e5a624f4b0dfedc6cc980bcd12bb866b1b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 22 Mar 2013 17:34:45 +0400
Subject: [PATCH] Updated test data.

---
 .../classObject/ClassObjectDeclaresVar.txt    |  2 +-
 .../loadKotlin/dataClass/MixedComponents.txt  |  2 +-
 .../testData/loadKotlin/dataClass/TwoVars.txt |  4 ++--
 .../testData/loadKotlin/prop/ClassVar.txt     |  2 +-
 .../testData/loadKotlin/prop/ExtVarClass.txt  |  2 +-
 .../loadKotlin/prop/ExtVarInClass.txt         |  2 +-
 .../testData/loadKotlin/prop/ExtVarInt.txt    |  2 +-
 .../loadKotlin/prop/ExtVarIntTInClass.txt     |  2 +-
 .../loadKotlin/prop/ExtVarIntTQInClass.txt    |  2 +-
 .../loadKotlin/prop/ExtVarMapPQInt.txt        |  2 +-
 .../loadKotlin/prop/ExtVarTIntInClass.txt     |  2 +-
 .../loadKotlin/prop/ExtVarTQIntInClass.txt    |  2 +-
 compiler/testData/loadKotlin/prop/ExtVarl.txt |  2 +-
 compiler/testData/loadKotlin/prop/NsVar.txt   |  2 +-
 .../loadKotlin/prop/TraitFinalVar.txt         |  2 +-
 .../prop/VarDelegationToTraitImpl.txt         |  4 ++--
 .../prop/defaultAccessors/ClassVar.txt        | 10 ++++-----
 .../defaultAccessors/ClassVarModality.txt     | 10 ++++-----
 .../prop/defaultAccessors/ClassVarParams.txt  | 10 ++++-----
 .../prop/defaultAccessors/ClassVarWithGet.txt | 10 ++++-----
 .../prop/defaultAccessors/ClassVarWithSet.txt | 22 +++++++++----------
 .../prop/defaultAccessors/ExtVarLong.txt      |  8 +++----
 .../defaultAccessors/ExtVarLongWithSet.txt    | 18 +++++++--------
 ...InternalAbstractTraitMembersOverridden.txt |  4 ++--
 .../visibility/InternalTraitMembers.txt       |  2 +-
 .../InternalTraitMembersInherited.txt         |  4 ++--
 .../TopLevelVarWithPrivateSetter.txt          |  2 +-
 27 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
index ba8768551b7..2130a309657 100644
--- a/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -7,6 +7,6 @@ internal final class ClassObjectDeclaresProperty {
         /*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
         internal final var s : jet.String
             internal final fun <get-s>() : jet.String
-            internal final fun <set-s>(/*0*/ <set-?> : jet.String) : Unit
+            internal final fun <set-s>(/*0*/ <set-?> : jet.String) : jet.Unit
     }
 }
diff --git a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
index c213347d034..101faeb0663 100644
--- a/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
+++ b/compiler/testData/loadKotlin/dataClass/MixedComponents.txt
@@ -4,7 +4,7 @@ jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int, /*2*/ z : jet.Double)
     internal final var x : jet.String
         internal final fun <get-x>() : jet.String
-        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : Unit
+        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : jet.Unit
     internal final val z : jet.Double
         internal final fun <get-z>() : jet.Double
     internal final /*synthesized*/ fun component1() : jet.String
diff --git a/compiler/testData/loadKotlin/dataClass/TwoVars.txt b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
index 0ff20f3a850..fee7a9a942d 100644
--- a/compiler/testData/loadKotlin/dataClass/TwoVars.txt
+++ b/compiler/testData/loadKotlin/dataClass/TwoVars.txt
@@ -4,10 +4,10 @@ jet.data() internal final class DataClass {
     /*primary*/ public constructor DataClass(/*0*/ x : jet.String, /*1*/ y : jet.Int)
     internal final var x : jet.String
         internal final fun <get-x>() : jet.String
-        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : Unit
+        internal final fun <set-x>(/*0*/ <set-?> : jet.String) : jet.Unit
     internal final var y : jet.Int
         internal final fun <get-y>() : jet.Int
-        internal final fun <set-y>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-y>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final /*synthesized*/ fun component1() : jet.String
     internal final /*synthesized*/ fun component2() : jet.Int
     internal final /*synthesized*/ fun copy(/*0*/ x : jet.String = ..., /*1*/ y : jet.Int = ...) : test.DataClass
diff --git a/compiler/testData/loadKotlin/prop/ClassVar.txt b/compiler/testData/loadKotlin/prop/ClassVar.txt
index b2095dd5920..311be5ca8a0 100644
--- a/compiler/testData/loadKotlin/prop/ClassVar.txt
+++ b/compiler/testData/loadKotlin/prop/ClassVar.txt
@@ -4,5 +4,5 @@ internal final class ClassVar {
     /*primary*/ public constructor ClassVar()
     internal final var aa : jet.Int
         internal final fun <get-aa>() : jet.Int
-        internal final fun <set-aa>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-aa>(/*0*/ <set-?> : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarClass.txt b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
index f7e922ff66d..87025f0af8a 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
@@ -2,4 +2,4 @@ package test
 
 internal var </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
     internal fun P.<get-anotherJavaClass>() : java.lang.Class<P>
-    internal fun P.<set-anotherJavaClass>(/*0*/ p : java.lang.Class<P>) : Unit
+    internal fun P.<set-anotherJavaClass>(/*0*/ p : java.lang.Class<P>) : jet.Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
index 8a454641994..9341f117073 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
@@ -4,5 +4,5 @@ internal final class ExtPropInClass {
     /*primary*/ public constructor ExtPropInClass()
     internal final var jet.Int.itIs : jet.Int
         internal final fun jet.Int.<get-itIs>() : jet.Int
-        internal final fun jet.Int.<set-itIs>(/*0*/ p : jet.Int) : Unit
+        internal final fun jet.Int.<set-itIs>(/*0*/ p : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInt.txt b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
index c61d2a06d21..fe86f6b5809 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
@@ -2,4 +2,4 @@ package test
 
 internal var jet.Int.ggg : jet.Int
     internal fun jet.Int.<get-ggg>() : jet.Int
-    internal fun jet.Int.<set-ggg>(/*0*/ p : jet.Int) : Unit
+    internal fun jet.Int.<set-ggg>(/*0*/ p : jet.Int) : jet.Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
index 887055b5236..94133ec2079 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
@@ -4,5 +4,5 @@ internal final class ExtValInClass</*0*/ P> {
     /*primary*/ public constructor ExtValInClass</*0*/ P>()
     internal final var jet.Int.asas : P
         internal final fun jet.Int.<get-asas>() : P
-        internal final fun jet.Int.<set-asas>(/*0*/ p : P) : Unit
+        internal final fun jet.Int.<set-asas>(/*0*/ p : P) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
index 1ccb8f40ea1..a90d005a43e 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
@@ -4,5 +4,5 @@ internal final class ExtValInClass</*0*/ P> {
     /*primary*/ public constructor ExtValInClass</*0*/ P>()
     internal final var jet.Int.asas : P?
         internal final fun jet.Int.<get-asas>() : P?
-        internal final fun jet.Int.<set-asas>(/*0*/ p : P?) : Unit
+        internal final fun jet.Int.<set-asas>(/*0*/ p : P?) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
index d343d1f92d9..5cc6cec508b 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
@@ -2,4 +2,4 @@ package test
 
 internal var </*0*/ P, /*1*/ Q> jet.Map<P, Q>.asas : jet.Int
     internal fun jet.Map<P, Q>.<get-asas>() : jet.Int
-    internal fun jet.Map<P, Q>.<set-asas>(/*0*/ i : jet.Int) : Unit
+    internal fun jet.Map<P, Q>.<set-asas>(/*0*/ i : jet.Int) : jet.Unit
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
index 35832907c05..28ac0b9b10b 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
@@ -4,5 +4,5 @@ internal final class ExtValPIntInClass</*0*/ P> {
     /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
     internal final var P.asas : jet.Int
         internal final fun P.<get-asas>() : jet.Int
-        internal final fun P.<set-asas>(/*0*/ p : jet.Int) : Unit
+        internal final fun P.<set-asas>(/*0*/ p : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
index d70d226b308..664294014e9 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
@@ -4,5 +4,5 @@ internal final class ExtValPIntInClass</*0*/ P> {
     /*primary*/ public constructor ExtValPIntInClass</*0*/ P>()
     internal final var P?.asas : jet.Int
         internal final fun P?.<get-asas>() : jet.Int
-        internal final fun P?.<set-asas>(/*0*/ p : jet.Int) : Unit
+        internal final fun P?.<set-asas>(/*0*/ p : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/ExtVarl.txt b/compiler/testData/loadKotlin/prop/ExtVarl.txt
index 39db4729d25..ecc9128b6f8 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarl.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarl.txt
@@ -2,6 +2,6 @@ package test
 
 internal var jet.Int.junk : jet.Short
     internal fun jet.Int.<get-junk>() : jet.Short
-    internal fun jet.Int.<set-junk>(/*0*/ p : jet.Short) : Unit
+    internal fun jet.Int.<set-junk>(/*0*/ p : jet.Short) : jet.Unit
 internal val jet.String.junk : jet.Int
     internal fun jet.String.<get-junk>() : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVar.txt b/compiler/testData/loadKotlin/prop/NsVar.txt
index 118612f8376..801bb5c76b5 100644
--- a/compiler/testData/loadKotlin/prop/NsVar.txt
+++ b/compiler/testData/loadKotlin/prop/NsVar.txt
@@ -2,4 +2,4 @@ package test
 
 internal var nsVal : jet.Int
     internal fun <get-nsVal>() : jet.Int
-    internal fun <set-nsVal>(/*0*/ <set-?> : jet.Int) : Unit
+    internal fun <set-nsVal>(/*0*/ <set-?> : jet.Int) : jet.Unit
diff --git a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
index f59540fd15c..e67fadcc2f7 100644
--- a/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
+++ b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
@@ -3,5 +3,5 @@ package test
 internal trait A {
     internal open var v : jet.String
         internal open fun <get-v>() : jet.String
-        internal open fun <set-v>(/*0*/ value : jet.String) : Unit
+        internal open fun <set-v>(/*0*/ value : jet.String) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
index ddc2df589db..35979e27b61 100644
--- a/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
@@ -3,12 +3,12 @@ package test
 internal trait A {
     internal open var v : jet.String
         internal open fun <get-v>() : jet.String
-        internal open fun <set-v>(/*0*/ value : jet.String) : Unit
+        internal open fun <set-v>(/*0*/ value : jet.String) : jet.Unit
 }
 
 internal final class B : test.A {
     /*primary*/ public constructor B()
     internal open override /*1*/ /*fake_override*/ var v : jet.String
         internal open override /*1*/ /*fake_override*/ fun <get-v>() : jet.String
-        internal open override /*1*/ /*fake_override*/ fun <set-v>(/*0*/ value : jet.String) : Unit
+        internal open override /*1*/ /*fake_override*/ fun <set-v>(/*0*/ value : jet.String) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.txt
index 01c5d05b6ea..a1829e65bdd 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.txt
@@ -4,17 +4,17 @@ internal final class ClassVar {
     /*primary*/ public constructor ClassVar()
     internal final var property1 : jet.Int
         internal final fun <get-property1>() : jet.Int
-        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final var property2 : jet.Int
         internal final fun <get-property2>() : jet.Int
-        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : jet.Unit
     private final var property3 : java.lang.Object
         private final fun <get-property3>() : java.lang.Object
-        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
     protected final var property4 : jet.String
         protected final fun <get-property4>() : jet.String
-        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : jet.Unit
     public final var property5 : jet.Int
         public final fun <get-property5>() : jet.Int
-        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : Unit
+        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.txt
index d60cf44835a..f43c57d3b62 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -4,21 +4,21 @@ internal open class ClassVarModality {
     /*primary*/ public constructor ClassVarModality()
     internal open var property1 : jet.Int
         internal open fun <get-property1>() : jet.Int
-        internal open fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+        internal open fun <set-property1>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final var property2 : jet.Int
         internal final fun <get-property2>() : jet.Int
-        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal open var property3 : jet.Int
         internal open fun <get-property3>() : jet.Int
-        private open fun <set-property3>(/*0*/ <set-?> : jet.Int) : Unit
+        private open fun <set-property3>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final var property4 : jet.Int
         internal final fun <get-property4>() : jet.Int
-        private final fun <set-property4>(/*0*/ <set-?> : jet.Int) : Unit
+        private final fun <set-property4>(/*0*/ <set-?> : jet.Int) : jet.Unit
 }
 
 internal abstract class ClassVarModalityAbstract {
     /*primary*/ public constructor ClassVarModalityAbstract()
     internal abstract var property1 : java.util.Date
         internal abstract fun <get-property1>() : java.util.Date
-        public abstract fun <set-property1>(/*0*/ <set-?> : java.util.Date) : Unit
+        public abstract fun <set-property1>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.txt
index e226dfefcd0..d6513d6a090 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.txt
@@ -4,17 +4,17 @@ internal final class ClassVarParams {
     /*primary*/ public constructor ClassVarParams(/*0*/ pr1 : jet.String, /*1*/ pr2 : jet.Int, /*2*/ pr3 : jet.Long, /*3*/ pr4 : java.util.Date, /*4*/ pr5 : jet.Any, /*5*/ pr6 : java.lang.Object)
     internal final var pr1 : jet.String
         internal final fun <get-pr1>() : jet.String
-        internal final fun <set-pr1>(/*0*/ <set-?> : jet.String) : Unit
+        internal final fun <set-pr1>(/*0*/ <set-?> : jet.String) : jet.Unit
     internal final var pr2 : jet.Int
         internal final fun <get-pr2>() : jet.Int
-        internal final fun <set-pr2>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-pr2>(/*0*/ <set-?> : jet.Int) : jet.Unit
     private final var pr3 : jet.Long
         private final fun <get-pr3>() : jet.Long
-        private final fun <set-pr3>(/*0*/ <set-?> : jet.Long) : Unit
+        private final fun <set-pr3>(/*0*/ <set-?> : jet.Long) : jet.Unit
     protected final var pr4 : java.util.Date
         protected final fun <get-pr4>() : java.util.Date
-        protected final fun <set-pr4>(/*0*/ <set-?> : java.util.Date) : Unit
+        protected final fun <set-pr4>(/*0*/ <set-?> : java.util.Date) : jet.Unit
     public final var pr5 : jet.Any
         public final fun <get-pr5>() : jet.Any
-        public final fun <set-pr5>(/*0*/ <set-?> : jet.Any) : Unit
+        public final fun <set-pr5>(/*0*/ <set-?> : jet.Any) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.txt
index a5d55695dae..29b1245f283 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.txt
@@ -4,17 +4,17 @@ internal final class ClassVal {
     /*primary*/ public constructor ClassVal()
     internal final var property1 : jet.Int
         internal final fun <get-property1>() : jet.Int
-        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final var property2 : jet.Int
         internal final fun <get-property2>() : jet.Int
-        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : jet.Unit
     private final var property3 : java.lang.Object
         private final fun <get-property3>() : java.lang.Object
-        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
     protected final var property4 : jet.String
         protected final fun <get-property4>() : jet.String
-        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : jet.Unit
     public final var property5 : jet.Int
         public final fun <get-property5>() : jet.Int
-        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : Unit
+        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.txt
index 69a43530bd7..cbde42b5be5 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.txt
@@ -4,35 +4,35 @@ internal final class ClassVal {
     /*primary*/ public constructor ClassVal()
     internal final var property1 : jet.Int
         internal final fun <get-property1>() : jet.Int
-        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : jet.Unit
     public final var property10 : jet.Int
         public final fun <get-property10>() : jet.Int
-        protected final fun <set-property10>(/*0*/ <set-?> : jet.Int) : Unit
+        protected final fun <set-property10>(/*0*/ <set-?> : jet.Int) : jet.Unit
     public final var property11 : jet.Int
         public final fun <get-property11>() : jet.Int
-        internal final fun <set-property11>(/*0*/ <set-?> : jet.Int) : Unit
+        internal final fun <set-property11>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal final var property2 : java.lang.Object
         internal final fun <get-property2>() : java.lang.Object
-        protected final fun <set-property2>(/*0*/ <set-?> : java.lang.Object) : Unit
+        protected final fun <set-property2>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
     internal final var property3 : java.lang.Object
         internal final fun <get-property3>() : java.lang.Object
-        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
     protected final var property4 : jet.String
         protected final fun <get-property4>() : jet.String
-        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : jet.Unit
     protected final var property5 : jet.String
         protected final fun <get-property5>() : jet.String
-        private final fun <set-property5>(/*0*/ <set-?> : jet.String) : Unit
+        private final fun <set-property5>(/*0*/ <set-?> : jet.String) : jet.Unit
     protected final var property6 : jet.String
         protected final fun <get-property6>() : jet.String
-        internal final fun <set-property6>(/*0*/ <set-?> : jet.String) : Unit
+        internal final fun <set-property6>(/*0*/ <set-?> : jet.String) : jet.Unit
     protected final var property7 : java.util.Date
         protected final fun <get-property7>() : java.util.Date
-        public final fun <set-property7>(/*0*/ <set-?> : java.util.Date) : Unit
+        public final fun <set-property7>(/*0*/ <set-?> : java.util.Date) : jet.Unit
     public final var property8 : jet.Int
         public final fun <get-property8>() : jet.Int
-        public final fun <set-property8>(/*0*/ <set-?> : jet.Int) : Unit
+        public final fun <set-property8>(/*0*/ <set-?> : jet.Int) : jet.Unit
     public final var property9 : jet.Int
         public final fun <get-property9>() : jet.Int
-        private final fun <set-property9>(/*0*/ <set-?> : jet.Int) : Unit
+        private final fun <set-property9>(/*0*/ <set-?> : jet.Int) : jet.Unit
 }
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.txt
index d6201e691c2..f50ecfffec8 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.txt
@@ -2,13 +2,13 @@ package test
 
 internal var jet.Long.date1 : java.lang.Object
     internal fun jet.Long.<get-date1>() : java.lang.Object
-    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : Unit
+    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
 internal var jet.Long.date12 : java.lang.Object
     internal fun jet.Long.<get-date12>() : java.lang.Object
-    internal fun jet.Long.<set-date12>(/*0*/ <set-?> : java.lang.Object) : Unit
+    internal fun jet.Long.<set-date12>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
 private var jet.Long.date3 : java.util.Date
     private fun jet.Long.<get-date3>() : java.util.Date
-    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.util.Date) : Unit
+    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 public var jet.Long.date5 : java.util.Date
     public fun jet.Long.<get-date5>() : java.util.Date
-    public fun jet.Long.<set-date5>(/*0*/ <set-?> : java.util.Date) : Unit
+    public fun jet.Long.<set-date5>(/*0*/ <set-?> : java.util.Date) : jet.Unit
diff --git a/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt b/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt
index 0c8f3a45afa..f177e9c4def 100644
--- a/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt
+++ b/compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt
@@ -2,28 +2,28 @@ package test
 
 internal var jet.Long.date1 : java.lang.Object
     internal fun jet.Long.<get-date1>() : java.lang.Object
-    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : Unit
+    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
 public var jet.Long.date10 : java.util.Date
     public fun jet.Long.<get-date10>() : java.util.Date
-    protected fun jet.Long.<set-date10>(/*0*/ <set-?> : java.util.Date) : Unit
+    protected fun jet.Long.<set-date10>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 public var jet.Long.date11 : java.util.Date
     public fun jet.Long.<get-date11>() : java.util.Date
-    public fun jet.Long.<set-date11>(/*0*/ <set-?> : java.util.Date) : Unit
+    public fun jet.Long.<set-date11>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 internal var jet.Long.date2 : java.lang.Object
     internal fun jet.Long.<get-date2>() : java.lang.Object
-    protected fun jet.Long.<set-date2>(/*0*/ <set-?> : java.lang.Object) : Unit
+    protected fun jet.Long.<set-date2>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
 internal var jet.Long.date3 : java.lang.Object
     internal fun jet.Long.<get-date3>() : java.lang.Object
-    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.lang.Object) : Unit
+    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.lang.Object) : jet.Unit
 private var jet.Long.date4 : java.util.Date
     private fun jet.Long.<get-date4>() : java.util.Date
-    private fun jet.Long.<set-date4>(/*0*/ <set-?> : java.util.Date) : Unit
+    private fun jet.Long.<set-date4>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 public var jet.Long.date7 : java.util.Date
     public fun jet.Long.<get-date7>() : java.util.Date
-    public fun jet.Long.<set-date7>(/*0*/ <set-?> : java.util.Date) : Unit
+    public fun jet.Long.<set-date7>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 public var jet.Long.date8 : java.util.Date
     public fun jet.Long.<get-date8>() : java.util.Date
-    internal fun jet.Long.<set-date8>(/*0*/ <set-?> : java.util.Date) : Unit
+    internal fun jet.Long.<set-date8>(/*0*/ <set-?> : java.util.Date) : jet.Unit
 public var jet.Long.date9 : java.util.Date
     public fun jet.Long.<get-date9>() : java.util.Date
-    private fun jet.Long.<set-date9>(/*0*/ <set-?> : java.util.Date) : Unit
+    private fun jet.Long.<set-date9>(/*0*/ <set-?> : java.util.Date) : jet.Unit
diff --git a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
index 8c5fa6dcb9a..1e8793ecd4c 100644
--- a/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
@@ -3,7 +3,7 @@ package test
 internal trait A {
     public abstract var p : jet.Int
         public abstract fun <get-p>() : jet.Int
-        public abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
+        public abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal abstract val v : jet.Int
         internal abstract fun <get-v>() : jet.Int
     internal abstract fun f() : jet.Int
@@ -13,7 +13,7 @@ internal final class B : test.A {
     /*primary*/ public constructor B()
     public open override /*1*/ var p : jet.Int
         public open override /*1*/ fun <get-p>() : jet.Int
-        public open override /*1*/ fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
+        public open override /*1*/ fun <set-p>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal open override /*1*/ val v : jet.Int
         internal open override /*1*/ fun <get-v>() : jet.Int
     internal open override /*1*/ fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
index 538f2ee75cf..ba85b197240 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
@@ -3,7 +3,7 @@ package test
 internal trait A {
     public abstract var p : jet.Int
         public abstract fun <get-p>() : jet.Int
-        internal abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : Unit
+        internal abstract fun <set-p>(/*0*/ <set-?> : jet.Int) : jet.Unit
     internal abstract val v : jet.Int
         internal abstract fun <get-v>() : jet.Int
     internal abstract fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
index e3ad78e16be..26cc5f66fd0 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
@@ -3,7 +3,7 @@ package test
 internal trait A {
     public open var p : jet.Int
         public open fun <get-p>() : jet.Int
-        internal open fun <set-p>(/*0*/ value : jet.Int) : Unit
+        internal open fun <set-p>(/*0*/ value : jet.Int) : jet.Unit
     internal open val v : jet.Int
         internal open fun <get-v>() : jet.Int
     internal open fun f() : jet.Int
@@ -13,7 +13,7 @@ internal final class B : test.A {
     /*primary*/ public constructor B()
     public open override /*1*/ /*fake_override*/ var p : jet.Int
         public open override /*1*/ /*fake_override*/ fun <get-p>() : jet.Int
-        internal open override /*1*/ /*fake_override*/ fun <set-p>(/*0*/ value : jet.Int) : Unit
+        internal open override /*1*/ /*fake_override*/ fun <set-p>(/*0*/ value : jet.Int) : jet.Unit
     internal open override /*1*/ /*fake_override*/ val v : jet.Int
         internal open override /*1*/ /*fake_override*/ fun <get-v>() : jet.Int
     internal open override /*1*/ /*fake_override*/ fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
index c8f3f2b00b2..7a7ac36fa4f 100644
--- a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
+++ b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
@@ -2,4 +2,4 @@ package test
 
 internal var topLevelVar : jet.Int
     internal fun <get-topLevelVar>() : jet.Int
-    private fun <set-topLevelVar>(/*0*/ <set-?> : jet.Int) : Unit
+    private fun <set-topLevelVar>(/*0*/ <set-?> : jet.Int) : jet.Unit