diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index a86ab549d31..10495be31ef 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -21,13 +21,13 @@
             <element id="module-output" name="preloader" />
             <element id="module-output" name="serialization" />
             <element id="module-output" name="serialization.java" />
-            <element id="directory" name="jet">
-              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/jet" />
-              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/jet" />
-            </element>
             <element id="module-output" name="backend-common" />
             <element id="library" level="project" name="builtins" />
             <element id="module-output" name="js.dart-ast" />
+            <element id="directory" name="kotlin">
+              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
+              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
+            </element>
           </element>
           <element id="library" level="project" name="javax.inject" />
           <element id="directory" name="jps">
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
index bfc8a16ea7d..4b514569013 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
@@ -52,8 +52,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
     public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
             new ImportPath("java.lang.*"),
             new ImportPath("kotlin.*"),
-            new ImportPath("kotlin.io.*"),
-            new ImportPath("jet.*"));
+            new ImportPath("kotlin.io.*"));
 
     private AnalyzerFacadeForJVM() {
     }
diff --git a/core/builtins/native/jet/Any.kt b/core/builtins/native/kotlin/Any.kt
similarity index 91%
rename from core/builtins/native/jet/Any.kt
rename to core/builtins/native/kotlin/Any.kt
index 91915e06267..2317e9e99c7 100644
--- a/core/builtins/native/jet/Any.kt
+++ b/core/builtins/native/kotlin/Any.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public open class Any {
     public open fun equals(other: Any?): Boolean
diff --git a/core/builtins/native/jet/Arrays.kt b/core/builtins/native/kotlin/Arrays.kt
similarity index 95%
rename from core/builtins/native/jet/Arrays.kt
rename to core/builtins/native/kotlin/Arrays.kt
index 1df4156aef9..e8e4c5ab1b6 100644
--- a/core/builtins/native/jet/Arrays.kt
+++ b/core/builtins/native/kotlin/Arrays.kt
@@ -1,8 +1,8 @@
-package jet
+package kotlin
 
 public fun arrayOfNulls<T>(size : Int) : Array<T?>
 
-public class Array<reified T>(public val size : Int, init : (Int) -> T) {
+public class Array<reified T>(public val size : Int, init : Function1<Int, T>) {
   public fun get(index : Int) : T
   public fun set(index : Int, value : T) : Unit
 
diff --git a/core/builtins/native/jet/Char.kt b/core/builtins/native/kotlin/Char.kt
similarity index 99%
rename from core/builtins/native/jet/Char.kt
rename to core/builtins/native/kotlin/Char.kt
index 40fbaa50dbf..88d8c5dc4c0 100644
--- a/core/builtins/native/jet/Char.kt
+++ b/core/builtins/native/kotlin/Char.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public class Char private () : Comparable<Char> {
     public fun compareTo(other : Double) : Int
diff --git a/core/builtins/native/jet/Collections.kt b/core/builtins/native/kotlin/Collections.kt
similarity index 99%
rename from core/builtins/native/jet/Collections.kt
rename to core/builtins/native/kotlin/Collections.kt
index c237c3f4a09..0c07f020d0c 100644
--- a/core/builtins/native/jet/Collections.kt
+++ b/core/builtins/native/kotlin/Collections.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Iterable<out T> {
     public fun iterator() : Iterator<T>
@@ -146,4 +146,4 @@ public trait MutableMap<K, V> : Map<K, V> {
     public trait MutableEntry<K,V> : Map.Entry<K, V> {
     	public fun setValue(value : V) : V
     }
-}
\ No newline at end of file
+}
diff --git a/core/builtins/native/jet/Enum.kt b/core/builtins/native/kotlin/Enum.kt
similarity index 90%
rename from core/builtins/native/jet/Enum.kt
rename to core/builtins/native/kotlin/Enum.kt
index 1ded3978aee..ed6996e969e 100644
--- a/core/builtins/native/jet/Enum.kt
+++ b/core/builtins/native/kotlin/Enum.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public abstract class Enum<E: Enum<E>>(name: String, ordinal: Int) {
   public final fun name()    : String
diff --git a/core/builtins/native/jet/Iterator.kt b/core/builtins/native/kotlin/Iterator.kt
similarity index 98%
rename from core/builtins/native/jet/Iterator.kt
rename to core/builtins/native/kotlin/Iterator.kt
index 6e730531a34..0f6f5af9270 100644
--- a/core/builtins/native/jet/Iterator.kt
+++ b/core/builtins/native/kotlin/Iterator.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Iterator<out T> {
     public fun next(): T
diff --git a/core/builtins/native/jet/Library.kt b/core/builtins/native/kotlin/Library.kt
similarity index 98%
rename from core/builtins/native/jet/Library.kt
rename to core/builtins/native/kotlin/Library.kt
index 9cd6ddb7010..e651761b0fc 100644
--- a/core/builtins/native/jet/Library.kt
+++ b/core/builtins/native/kotlin/Library.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Annotation
 
diff --git a/core/builtins/native/jet/Nothing.kt b/core/builtins/native/kotlin/Nothing.kt
similarity index 82%
rename from core/builtins/native/jet/Nothing.kt
rename to core/builtins/native/kotlin/Nothing.kt
index 836cc3bfad7..21f4a935217 100644
--- a/core/builtins/native/jet/Nothing.kt
+++ b/core/builtins/native/kotlin/Nothing.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 /**
  * Nothing has no instances
diff --git a/core/builtins/native/jet/Numbers.kt b/core/builtins/native/kotlin/Numbers.kt
similarity index 99%
rename from core/builtins/native/jet/Numbers.kt
rename to core/builtins/native/kotlin/Numbers.kt
index 222748953e9..123c693d3dc 100644
--- a/core/builtins/native/jet/Numbers.kt
+++ b/core/builtins/native/kotlin/Numbers.kt
@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public abstract class Number {
   public abstract fun toDouble() : Double
diff --git a/core/builtins/src/jet/Annotations.kt b/core/builtins/src/kotlin/Annotations.kt
similarity index 98%
rename from core/builtins/src/jet/Annotations.kt
rename to core/builtins/src/kotlin/Annotations.kt
index 644164ae0cb..c314f5174a7 100644
--- a/core/builtins/src/jet/Annotations.kt
+++ b/core/builtins/src/kotlin/Annotations.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public annotation class data
 
diff --git a/core/builtins/src/jet/ExtensionFunctions.kt b/core/builtins/src/kotlin/ExtensionFunctions.kt
similarity index 99%
rename from core/builtins/src/jet/ExtensionFunctions.kt
rename to core/builtins/src/kotlin/ExtensionFunctions.kt
index 86371d8348f..4829c96c07e 100644
--- a/core/builtins/src/jet/ExtensionFunctions.kt
+++ b/core/builtins/src/kotlin/ExtensionFunctions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait ExtensionFunction0<in T, out R> {
     public fun T.invoke(): R
diff --git a/core/builtins/src/jet/Functions.kt b/core/builtins/src/kotlin/Functions.kt
similarity index 99%
rename from core/builtins/src/jet/Functions.kt
rename to core/builtins/src/kotlin/Functions.kt
index 717299c93bb..c563d2ba781 100644
--- a/core/builtins/src/jet/Functions.kt
+++ b/core/builtins/src/kotlin/Functions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait Function0<out R> {
     public fun invoke(): R
diff --git a/core/builtins/src/jet/Inline.kt b/core/builtins/src/kotlin/Inline.kt
similarity index 97%
rename from core/builtins/src/jet/Inline.kt
rename to core/builtins/src/kotlin/Inline.kt
index 2dff4f2ead1..05906f326a4 100644
--- a/core/builtins/src/jet/Inline.kt
+++ b/core/builtins/src/kotlin/Inline.kt
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public annotation class noinline
+
 public annotation class inline(public val strategy: InlineStrategy = InlineStrategy.AS_FUNCTION)
+
 public enum class InlineStrategy {
     AS_FUNCTION
     IN_PLACE
diff --git a/core/builtins/src/jet/Iterators.kt b/core/builtins/src/kotlin/Iterators.kt
similarity index 99%
rename from core/builtins/src/jet/Iterators.kt
rename to core/builtins/src/kotlin/Iterators.kt
index dd0548af2cc..21498f3f73e 100644
--- a/core/builtins/src/jet/Iterators.kt
+++ b/core/builtins/src/kotlin/Iterators.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public abstract class ByteIterator : Iterator<Byte> {
     override final fun next() = nextByte()
diff --git a/core/builtins/src/jet/KExtensionFunctions.kt b/core/builtins/src/kotlin/KExtensionFunctions.kt
similarity index 99%
rename from core/builtins/src/jet/KExtensionFunctions.kt
rename to core/builtins/src/kotlin/KExtensionFunctions.kt
index 8d4af5b625e..719b7ca7102 100644
--- a/core/builtins/src/jet/KExtensionFunctions.kt
+++ b/core/builtins/src/kotlin/KExtensionFunctions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KExtensionFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KExtensionFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>
diff --git a/core/builtins/src/jet/KFunctions.kt b/core/builtins/src/kotlin/KFunctions.kt
similarity index 99%
rename from core/builtins/src/jet/KFunctions.kt
rename to core/builtins/src/kotlin/KFunctions.kt
index 3b84db9aa5a..5799cc48eb2 100644
--- a/core/builtins/src/jet/KFunctions.kt
+++ b/core/builtins/src/kotlin/KFunctions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KFunction0<out R> : Function0<R>
 public trait KFunction1<in P1, out R> : Function1<P1, R>
diff --git a/core/builtins/src/jet/KMemberFunctions.kt b/core/builtins/src/kotlin/KMemberFunctions.kt
similarity index 99%
rename from core/builtins/src/jet/KMemberFunctions.kt
rename to core/builtins/src/kotlin/KMemberFunctions.kt
index 3bf1436242c..69652b87e3d 100644
--- a/core/builtins/src/jet/KMemberFunctions.kt
+++ b/core/builtins/src/kotlin/KMemberFunctions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KMemberFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KMemberFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>
diff --git a/core/builtins/src/jet/Progression.kt b/core/builtins/src/kotlin/Progression.kt
similarity index 98%
rename from core/builtins/src/jet/Progression.kt
rename to core/builtins/src/kotlin/Progression.kt
index eebf5fbf239..e84a9ca78b5 100644
--- a/core/builtins/src/jet/Progression.kt
+++ b/core/builtins/src/kotlin/Progression.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait Progression<out N : Any> : Iterable<N> {
     public val start: N
diff --git a/core/builtins/src/jet/ProgressionIterators.kt b/core/builtins/src/kotlin/ProgressionIterators.kt
similarity index 99%
rename from core/builtins/src/jet/ProgressionIterators.kt
rename to core/builtins/src/kotlin/ProgressionIterators.kt
index 35514a16950..f44fed93ad6 100644
--- a/core/builtins/src/jet/ProgressionIterators.kt
+++ b/core/builtins/src/kotlin/ProgressionIterators.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 import kotlin.internal.getProgressionFinalElement
 
diff --git a/core/builtins/src/jet/Progressions.kt b/core/builtins/src/kotlin/Progressions.kt
similarity index 99%
rename from core/builtins/src/jet/Progressions.kt
rename to core/builtins/src/kotlin/Progressions.kt
index ed22d2bf40b..774dadb1a9e 100644
--- a/core/builtins/src/jet/Progressions.kt
+++ b/core/builtins/src/kotlin/Progressions.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public class ByteProgression(
         public override val start: Byte,
diff --git a/core/builtins/src/jet/PropertyMetadata.kt b/core/builtins/src/kotlin/PropertyMetadata.kt
similarity index 98%
rename from core/builtins/src/jet/PropertyMetadata.kt
rename to core/builtins/src/kotlin/PropertyMetadata.kt
index 7b91d02b1eb..d3ebb499494 100644
--- a/core/builtins/src/jet/PropertyMetadata.kt
+++ b/core/builtins/src/kotlin/PropertyMetadata.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait PropertyMetadata {
     public val name: String
diff --git a/core/builtins/src/jet/Range.kt b/core/builtins/src/kotlin/Range.kt
similarity index 98%
rename from core/builtins/src/jet/Range.kt
rename to core/builtins/src/kotlin/Range.kt
index 99bed219a87..eae8bbab1d7 100644
--- a/core/builtins/src/jet/Range.kt
+++ b/core/builtins/src/kotlin/Range.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait Range<T : Comparable<T>> {
     public val start: T
diff --git a/core/builtins/src/jet/Ranges.kt b/core/builtins/src/kotlin/Ranges.kt
similarity index 99%
rename from core/builtins/src/jet/Ranges.kt
rename to core/builtins/src/kotlin/Ranges.kt
index 8ff050f8914..ebd9574cc62 100644
--- a/core/builtins/src/jet/Ranges.kt
+++ b/core/builtins/src/kotlin/Ranges.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public class ByteRange(public override val start: Byte, public override val end: Byte) : Range<Byte>, Progression<Byte> {
     override val increment: Int
diff --git a/core/builtins/src/jet/Unit.kt b/core/builtins/src/kotlin/Unit.kt
similarity index 91%
rename from core/builtins/src/jet/Unit.kt
rename to core/builtins/src/kotlin/Unit.kt
index 063ed70ed3c..591ac6760db 100644
--- a/core/builtins/src/jet/Unit.kt
+++ b/core/builtins/src/kotlin/Unit.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public class Unit private() {
-    override fun toString() = "Unit.VALUE"
+    override fun toString(): String = "Unit.VALUE"
 
     class object {
         public val VALUE: Unit = Unit()
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
index d77414a5cfb..36dc1611d4d 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -40,7 +40,7 @@ import static org.jetbrains.jet.lang.types.lang.PrimitiveType.*;
 public class KotlinBuiltIns {
     public static final JetScope STUB = JetScope.EMPTY;
 
-    public static final String BUILT_INS_PACKAGE_NAME_STRING = "jet";
+    public static final String BUILT_INS_PACKAGE_NAME_STRING = "kotlin";
     public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier(BUILT_INS_PACKAGE_NAME_STRING);
     public static final FqName BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME);
 
diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java b/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java
index 5e035de0897..585ceea8ef2 100644
--- a/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java
+++ b/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java
@@ -16,8 +16,8 @@
 
 package kotlin.jvm.internal;
 
-import jet.Function0;
-import jet.IntRange;
+import kotlin.Function0;
+import kotlin.IntRange;
 import kotlin.KotlinNullPointerException;
 
 import java.util.ArrayList;