diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt
index 0e7ac0af908..abaf1a90b1a 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt
@@ -82,6 +82,7 @@ private fun psiType(kotlinType: KotlinType, context: PsiElement): PsiType? {
         "kotlin.Char" -> PsiType.CHAR
         "kotlin.Double" -> PsiType.DOUBLE
         "kotlin.Float" -> PsiType.FLOAT
+        "kotlin.Unit" -> PsiType.VOID
         "kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
         else -> PsiType.getTypeByName(typeFqName, context.project, context.resolveScope)
     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt.173 b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt.173
index 8bf8c1547b4..63d2af56d89 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt.173
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt.173
@@ -82,6 +82,7 @@ private fun psiType(kotlinType: KotlinType, context: PsiElement): PsiType? {
             "kotlin.Char" -> PsiType.CHAR
             "kotlin.Double" -> PsiType.DOUBLE
             "kotlin.Float" -> PsiType.FLOAT
+        "kotlin.Unit" -> PsiType.VOID
         "kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
         else -> PsiType.getTypeByName(typeFqName, context.project, context.resolveScope)
     }
diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
index 9899f95d3e8..fb33a27cec5 100644
--- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
@@ -182,6 +182,7 @@ internal fun KotlinType.toPsiType(lightDeclaration: PsiModifierListOwner?, conte
             "kotlin.Char" -> PsiType.CHAR.orBoxed()
             "kotlin.Double" -> PsiType.DOUBLE.orBoxed()
             "kotlin.Float" -> PsiType.FLOAT.orBoxed()
+            "kotlin.Unit" -> PsiType.VOID.orBoxed()
             "kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
             else -> {
                 val typeConstructor = this.constructor
diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt
index 13bc3361c22..8fef1e65ec1 100644
--- a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt
+++ b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt
@@ -51,10 +51,10 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
                 UReturnExpression [return i]
                     USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
         UAnnotationMethod (name = foo) [public static final fun foo() : void {...}]
-            UBlockExpression [{...}] : PsiType:Unit
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:Unit
+            UBlockExpression [{...}] : PsiType:void
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:void
                     UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
-                    USimpleNameReferenceExpression (identifier = println) [println] : PsiType:Unit
+                    USimpleNameReferenceExpression (identifier = println) [println] : PsiType:void
                     USimpleNameReferenceExpression (identifier = baz) [baz]
                 UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()]
                     ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.172 b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.172
index 91aa1aead2a..8804a1e7a31 100644
--- a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.172
+++ b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.172
@@ -51,10 +51,10 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
                 UReturnExpression [return i]
                     USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
         UAnnotationMethod (name = foo) [public static final fun foo() : void {...}]
-            UBlockExpression [{...}] : PsiType:Unit
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:Unit
+            UBlockExpression [{...}] : PsiType:void
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:void
                     UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
-                    USimpleNameReferenceExpression (identifier = println) [println] : PsiType:Unit
+                    USimpleNameReferenceExpression (identifier = println) [println] : PsiType:void
                     USimpleNameReferenceExpression (identifier = baz) [baz]
                 UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()]
                     ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
index c12e7197e65..b8a3c9701ef 100644
--- a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
+++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
@@ -16,10 +16,10 @@ UFile (package = ) [public abstract interface Callback {...]
                         USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
         UAnnotationMethod (name = Model) [public fun Model() {...}]
             UBlockExpression [{...}]
-                UBlockExpression [{...}] : PsiType:Unit
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:Unit
+                UBlockExpression [{...}] : PsiType:void
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:void
                         UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))]
-                        USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:Unit
+                        USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:void
                         UQualifiedReferenceExpression [Callback.java] : PsiType:Class<Callback>
                             UClassLiteralExpression [Callback] : PsiType:KClass<Callback>
                             USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<Callback>
diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.172 b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.172
index 6ada6272f88..6fcc8963b29 100644
--- a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.172
+++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.172
@@ -16,10 +16,10 @@ UFile (package = ) [public abstract interface Callback {...]
                         USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
         UAnnotationMethod (name = Model) [public fun Model() {...}]
             UBlockExpression [{...}]
-                UBlockExpression [{...}] : PsiType:Unit
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:Unit
+                UBlockExpression [{...}] : PsiType:void
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:void
                         UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))]
-                        USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:Unit
+                        USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:void
                         UQualifiedReferenceExpression [Callback.java] : PsiType:Class<Callback>
                             UClassLiteralExpression [Callback] : PsiType:KClass<Callback>
                             USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<Callback>
diff --git a/plugins/uast-kotlin/testData/ea101715.types.txt b/plugins/uast-kotlin/testData/ea101715.types.txt
index 1cab3bb3122..37644126bc9 100644
--- a/plugins/uast-kotlin/testData/ea101715.types.txt
+++ b/plugins/uast-kotlin/testData/ea101715.types.txt
@@ -1,7 +1,7 @@
 UFile (package = ) [public final class Ea101715Kt {...]
     UClass (name = Ea101715Kt) [public final class Ea101715Kt {...}]
         UAnnotationMethod (name = a) [public static final fun a() : void {...}]
-            UBlockExpression [{...}] : PsiType:Unit
+            UBlockExpression [{...}] : PsiType:void
                 UDeclarationsExpression [var a: <ErrorType> = Obj(555)]
                     ULocalVariable (name = a) [var a: <ErrorType> = Obj(555)]
                         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [Obj(555)]
diff --git a/plugins/uast-kotlin/testData/ea101715.types.txt.172 b/plugins/uast-kotlin/testData/ea101715.types.txt.172
index 1bda09432b3..c185c5362ff 100644
--- a/plugins/uast-kotlin/testData/ea101715.types.txt.172
+++ b/plugins/uast-kotlin/testData/ea101715.types.txt.172
@@ -1,7 +1,7 @@
 UFile (package = ) [public final class Ea101715Kt {...]
     UClass (name = Ea101715Kt) [public final class Ea101715Kt {...}]
         UAnnotationMethod (name = a) [public static final fun a() : void {...}]
-            UBlockExpression [{...}] : PsiType:Unit
+            UBlockExpression [{...}] : PsiType:void
                 UDeclarationsExpression [var a: <ErrorType> = Obj(555)]
                     ULocalVariable (name = a) [var a: <ErrorType> = Obj(555)]
                         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [Obj(555)]