diff --git a/compiler/testData/loadKotlin/type/Tuple0.kt b/compiler/testData/loadKotlin/type/Tuple0.kt
deleted file mode 100644
index 35080851976..00000000000
--- a/compiler/testData/loadKotlin/type/Tuple0.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun tuple0() = Unit.VALUE
diff --git a/compiler/testData/loadKotlin/type/Tuple0.txt b/compiler/testData/loadKotlin/type/Tuple0.txt
deleted file mode 100644
index 046ce27bbd6..00000000000
--- a/compiler/testData/loadKotlin/type/Tuple0.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-internal fun tuple0() : Unit
diff --git a/compiler/testData/loadKotlin/type/Unit.kt b/compiler/testData/loadKotlin/type/Unit.kt
new file mode 100644
index 00000000000..86ae30847ad
--- /dev/null
+++ b/compiler/testData/loadKotlin/type/Unit.kt
@@ -0,0 +1,3 @@
+package test
+
+fun unit() = Unit.VALUE
diff --git a/compiler/testData/loadKotlin/type/Unit.txt b/compiler/testData/loadKotlin/type/Unit.txt
new file mode 100644
index 00000000000..1c7ce82d1dc
--- /dev/null
+++ b/compiler/testData/loadKotlin/type/Unit.txt
@@ -0,0 +1,3 @@
+package test
+
+internal fun unit() : Unit
diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt
index fe8f23ed933..e511aeb13dd 100644
--- a/compiler/testData/renderer/FunctionTypes.kt
+++ b/compiler/testData/renderer/FunctionTypes.kt
@@ -1,8 +1,8 @@
-var v1 : () -> Tuple0
+var v1 : () -> Unit
 var v2 : (Int) -> Int
 var v3 : (Int, String) -> String
 var v4 : Function1<Int, String>
-var v4 : (() -> Int, (String) -> Tuple0) -> String
+var v4 : (() -> Int, (String) -> Unit) -> String
 var v5 : Int.() -> Int
 var v6  : Int.(String, Int) -> Unit
 var v7  : ExtensionFunction1<Int, String, Boolean>
diff --git a/compiler/testData/renderer/TupleTypes.kt b/compiler/testData/renderer/TupleTypes.kt
index 51f4bbc0257..a24ba3725a4 100644
--- a/compiler/testData/renderer/TupleTypes.kt
+++ b/compiler/testData/renderer/TupleTypes.kt
@@ -1,9 +1,5 @@
-var v1 : Tuple0
-var v2 : Tuple0?
-var v3 : Unit
-var v4 : Unit?
+var v1 : Unit
+var v2 : Unit?
 
 //internal var v1 : Unit defined in root package
 //internal var v2 : Unit? defined in root package
-//internal var v3 : Unit defined in root package
-//internal var v4 : Unit? defined in root package
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
index 7ac9f04378d..a05b057f960 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
@@ -986,9 +986,9 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
             doTestWithAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
         }
         
-        @TestMetadata("Tuple0.kt")
-        public void testTuple0() throws Exception {
-            doTestWithAccessors("compiler/testData/loadKotlin/type/Tuple0.kt");
+        @TestMetadata("Unit.kt")
+        public void testUnit() throws Exception {
+            doTestWithAccessors("compiler/testData/loadKotlin/type/Unit.kt");
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 77c31104d3b..9a1d56bc9f8 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -988,9 +988,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                 doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/StringQ.kt");
             }
             
-            @TestMetadata("Tuple0.kt")
-            public void testTuple0() throws Exception {
-                doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Tuple0.kt");
+            @TestMetadata("Unit.kt")
+            public void testUnit() throws Exception {
+                doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/type/Unit.kt");
             }
             
         }
diff --git a/idea/testData/completion/class/InExpressionNoPrefix.kt b/idea/testData/completion/class/InExpressionNoPrefix.kt
index c7d36914f82..83a4c1f0956 100644
--- a/idea/testData/completion/class/InExpressionNoPrefix.kt
+++ b/idea/testData/completion/class/InExpressionNoPrefix.kt
@@ -5,5 +5,5 @@ class Test {
 }
 
 // RUNTIME: 1
-// EXIST: Any, Nothing, Tuple0, Int, Number
+// EXIST: Any, Nothing, Unit, Int, Number
 // EXIST: Array, Math, Hashable, OutputStream
\ No newline at end of file
diff --git a/idea/testData/completion/class/InExtendTypeAnnotation.kt b/idea/testData/completion/class/InExtendTypeAnnotation.kt
index 7fdd91be0be..0137766b071 100644
--- a/idea/testData/completion/class/InExtendTypeAnnotation.kt
+++ b/idea/testData/completion/class/InExtendTypeAnnotation.kt
@@ -4,5 +4,5 @@ class Test : <caret> {
 }
 
 // RUNTIME: 1
-// EXIST: Any, Nothing, Tuple0, Int, Number
+// EXIST: Any, Nothing, Unit, Int, Number
 // EXIST: Array, Math, Hashable, OutputStream
\ No newline at end of file
diff --git a/idea/testData/resolve/builtins/unit.kt b/idea/testData/resolve/builtins/unit.kt
index 463178f6e47..b3e979ea638 100644
--- a/idea/testData/resolve/builtins/unit.kt
+++ b/idea/testData/resolve/builtins/unit.kt
@@ -1,2 +1,2 @@
 var x : <ref>Unit?
-//jet/Unit.jet:Tuple0
\ No newline at end of file
+//jet/Unit.jet:Unit
\ No newline at end of file
diff --git a/libraries/stdlib/src/kotlin/StringsJVM.kt b/libraries/stdlib/src/kotlin/StringsJVM.kt
index 180326c9ae9..00740d705f4 100644
--- a/libraries/stdlib/src/kotlin/StringsJVM.kt
+++ b/libraries/stdlib/src/kotlin/StringsJVM.kt
@@ -102,7 +102,7 @@ public inline fun String.getBytes(charset : java.nio.charset.Charset) : ByteArra
 
 public inline fun String.getBytes(charsetName : String) : ByteArray = (this as java.lang.String).getBytes(charsetName)
 
-public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Tuple0 = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin)
+public inline fun String.getChars(srcBegin : Int, srcEnd : Int, dst : CharArray, dstBegin : Int) : Unit = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin)
 
 public inline fun String.indexOf(ch : Char) : Int = (this as java.lang.String).indexOf(ch.toString())