From 4f8e6c1dcc3086c01e9d9aa66ccbce6b706fea34 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 2 Jan 2015 20:12:56 +0300
Subject: [PATCH] Rename package jet -> kotlin in generators

org.jetbrains.jet.generators -> org.jetbrains.kotlin.generators
---
 .../runConfigurations/Generate_Injectors.xml  |  2 +-
 .idea/runConfigurations/Generate_Tests.xml    |  4 +--
 .../tests/CodegenTestsOnAndroidGenerator.java |  2 +-
 .../tests/org/jetbrains/jet/JetTestUtils.java |  2 +-
 .../generators/builtins/arrayIterators.kt     |  8 ++---
 .../generators/builtins/arrays.kt             |  8 ++---
 .../generators/builtins/common.kt             |  6 ++--
 .../generators/builtins/functions.kt          |  8 ++---
 .../generators/builtins/generateBuiltIns.kt   | 18 +++++------
 .../generators/builtins/iterators.kt          |  8 ++---
 .../builtins/progressionIterators.kt          | 10 +++----
 .../generators/builtins/progressions.kt       | 10 +++----
 .../generators/builtins/ranges.kt             | 10 +++----
 .../evaluate/GenerateOperationsMap.kt         |  6 ++--
 .../frontend/GenerateKeywordStrings.java      |  6 ++--
 .../generators/injectors/GenerateInjectors.kt |  6 ++--
 .../generators/mockJDK/GenerateMockJdk.java   |  4 +--
 .../generators/protobuf/GenerateProtoBuf.kt   |  4 +--
 .../tests/GenerateRangesCodegenTestData.java  |  4 +--
 .../generators/tests/GenerateTests.kt         | 18 +++++------
 .../tests/generateTestDataForReservedWords.kt |  6 ++--
 .../generator/DelegatingTestClassModel.java   | 30 +++++++++----------
 .../tests/generator/SimpleTestClassModel.java |  6 ++--
 .../generator/SimpleTestMethodModel.java      |  6 ++--
 .../tests/generator/SingleClassTestModel.java |  6 ++--
 .../tests/generator/TestClassModel.java       |  4 +--
 .../tests/generator/TestEntityModel.java      |  4 +--
 .../tests/generator/TestGenerator.java        |  4 +--
 .../tests/generator/TestGeneratorUtil.java    |  4 +--
 .../tests/generator/TestMethodModel.java      |  4 +--
 .../builtins/GenerateBuiltInsTest.kt          |  6 ++--
 .../evaluate/GenerateOperationsMapTest.kt     |  6 ++--
 .../frontend/GenerateKeywordStringsTest.java  |  4 +--
 .../injectors/GenerateInjectorsTest.java      |  4 +--
 .../protobuf/ProtoBufConsistencyTest.kt       |  4 +--
 35 files changed, 121 insertions(+), 121 deletions(-)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/arrayIterators.kt (85%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/arrays.kt (85%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/common.kt (90%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/functions.kt (92%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/generateBuiltIns.kt (83%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/iterators.kt (82%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/progressionIterators.kt (89%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/progressions.kt (92%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/builtins/ranges.kt (91%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/evaluate/GenerateOperationsMap.kt (96%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/frontend/GenerateKeywordStrings.java (94%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/injectors/GenerateInjectors.kt (98%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/mockJDK/GenerateMockJdk.java (99%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/protobuf/GenerateProtoBuf.kt (97%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/GenerateRangesCodegenTestData.java (99%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/GenerateTests.kt (98%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generateTestDataForReservedWords.kt (99%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/DelegatingTestClassModel.java (60%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/SimpleTestClassModel.java (97%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/SimpleTestMethodModel.java (95%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/SingleClassTestModel.java (96%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/TestClassModel.java (90%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/TestEntityModel.java (87%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/TestGenerator.java (98%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/TestGeneratorUtil.java (93%)
 rename generators/src/org/jetbrains/{jet => kotlin}/generators/tests/generator/TestMethodModel.java (88%)
 rename generators/tests/org/jetbrains/{jet => kotlin}/generators/builtins/GenerateBuiltInsTest.kt (88%)
 rename generators/tests/org/jetbrains/{jet => kotlin}/generators/evaluate/GenerateOperationsMapTest.kt (86%)
 rename generators/tests/org/jetbrains/{jet => kotlin}/generators/frontend/GenerateKeywordStringsTest.java (92%)
 rename generators/tests/org/jetbrains/{jet => kotlin}/generators/injectors/GenerateInjectorsTest.java (95%)
 rename generators/tests/org/jetbrains/{jet => kotlin}/generators/protobuf/ProtoBufConsistencyTest.kt (96%)

diff --git a/.idea/runConfigurations/Generate_Injectors.xml b/.idea/runConfigurations/Generate_Injectors.xml
index c65246abe2b..a3bdc71e48c 100644
--- a/.idea/runConfigurations/Generate_Injectors.xml
+++ b/.idea/runConfigurations/Generate_Injectors.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Generate Injectors" type="JetRunConfigurationType" factoryName="Kotlin">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.injectors.InjectorsPackage" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.injectors.InjectorsPackage" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
diff --git a/.idea/runConfigurations/Generate_Tests.xml b/.idea/runConfigurations/Generate_Tests.xml
index 9a68a1d0da3..5a4979ec5ad 100644
--- a/.idea/runConfigurations/Generate_Tests.xml
+++ b/.idea/runConfigurations/Generate_Tests.xml
@@ -2,11 +2,11 @@
   <configuration default="false" name="Generate Tests" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
       <pattern>
-        <option name="PATTERN" value="org.jetbrains.jet.generators.tests.*" />
+        <option name="PATTERN" value="org.jetbrains.kotlin.generators.tests.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.generators.tests.TestsPackage" />
+    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.generators.tests.TestsPackage" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index d0409576554..bd8478bf981 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -30,10 +30,10 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.CodegenTestFiles;
 import org.jetbrains.jet.codegen.GenerationUtils;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.Printer;
+import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index 97fc6fe7773..5b7167f36f3 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -97,7 +97,7 @@ import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToD
 import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
 
 public class JetTestUtils {
-    public static final String TEST_GENERATOR_NAME = "org.jetbrains.jet.generators.tests.TestsPackage";
+    public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage";
     public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)";
 
     private static final Pattern KT_FILES = Pattern.compile(".*?.kt");
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/arrayIterators.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
similarity index 85%
rename from generators/src/org/jetbrains/jet/generators/builtins/arrayIterators.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
index 8e226f77a4c..aed146d81d8 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/arrayIterators.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/arrayIterators.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.arrayIterators
+package org.jetbrains.kotlin.generators.builtins.arrayIterators
 
-import org.jetbrains.jet.generators.builtins.PrimitiveType
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.PrimitiveType
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
 import java.io.PrintWriter
 
 class GenerateArrayIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/arrays.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt
similarity index 85%
rename from generators/src/org/jetbrains/jet/generators/builtins/arrays.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt
index a3e5b54eb07..f3bef39f5fe 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/arrays.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/arrays.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.arrays
+package org.jetbrains.kotlin.generators.builtins.arrays
 
-import org.jetbrains.jet.generators.builtins.PrimitiveType
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.PrimitiveType
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
 import java.io.PrintWriter
 
 class GenerateArrays(out: PrintWriter) : BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/common.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
similarity index 90%
rename from generators/src/org/jetbrains/jet/generators/builtins/common.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
index 4fbc8ca5655..f77fc36aeb4 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/common.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins
+package org.jetbrains.kotlin.generators.builtins
 
-import org.jetbrains.jet.generators.builtins.ProgressionKind.*
+import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
 
 enum class PrimitiveType {
     BYTE
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt
similarity index 92%
rename from generators/src/org/jetbrains/jet/generators/builtins/functions.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt
index 9e767276bac..16296338bd4 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/functions.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/functions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.functions
+package org.jetbrains.kotlin.generators.builtins.functions
 
 import java.io.PrintWriter
-import org.jetbrains.jet.generators.builtins.functions.FunctionKind.*
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.functions.FunctionKind.*
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
 
 val MAX_PARAM_COUNT = 22
 
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
similarity index 83%
rename from generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
index 518617e94ab..f65468b9afd 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/generateBuiltIns.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.generateBuiltIns
+package org.jetbrains.kotlin.generators.builtins.generateBuiltIns
 
-import org.jetbrains.jet.generators.builtins.arrays.*
-import org.jetbrains.jet.generators.builtins.arrayIterators.*
-import org.jetbrains.jet.generators.builtins.functions.*
-import org.jetbrains.jet.generators.builtins.iterators.*
-import org.jetbrains.jet.generators.builtins.progressionIterators.*
-import org.jetbrains.jet.generators.builtins.progressions.*
-import org.jetbrains.jet.generators.builtins.ranges.*
+import org.jetbrains.kotlin.generators.builtins.arrays.*
+import org.jetbrains.kotlin.generators.builtins.arrayIterators.*
+import org.jetbrains.kotlin.generators.builtins.functions.*
+import org.jetbrains.kotlin.generators.builtins.iterators.*
+import org.jetbrains.kotlin.generators.builtins.progressionIterators.*
+import org.jetbrains.kotlin.generators.builtins.progressions.*
+import org.jetbrains.kotlin.generators.builtins.ranges.*
 import java.io.PrintWriter
 import java.io.File
 
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/iterators.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/iterators.kt
similarity index 82%
rename from generators/src/org/jetbrains/jet/generators/builtins/iterators.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/iterators.kt
index 38c3611f9da..16eba5a34ed 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/iterators.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/iterators.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.iterators
+package org.jetbrains.kotlin.generators.builtins.iterators
 
-import org.jetbrains.jet.generators.builtins.PrimitiveType
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.PrimitiveType
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
 import java.io.PrintWriter
 
 class GenerateIterators(out: PrintWriter) : BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
similarity index 89%
rename from generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
index 760ed719d65..a48382dec85 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/progressionIterators.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/progressionIterators.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.progressionIterators
+package org.jetbrains.kotlin.generators.builtins.progressionIterators
 
-import org.jetbrains.jet.generators.builtins.*
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
-import org.jetbrains.jet.generators.builtins.ProgressionKind.*
+import org.jetbrains.kotlin.generators.builtins.*
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
 import java.io.PrintWriter
 
 fun integerProgressionIterator(kind: ProgressionKind): String {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/progressions.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
similarity index 92%
rename from generators/src/org/jetbrains/jet/generators/builtins/progressions.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
index 4156297d650..a58d659eac0 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/progressions.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/progressions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.progressions
+package org.jetbrains.kotlin.generators.builtins.progressions
 
-import org.jetbrains.jet.generators.builtins.*
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
-import org.jetbrains.jet.generators.builtins.ProgressionKind.*
+import org.jetbrains.kotlin.generators.builtins.*
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
 import java.io.PrintWriter
 
 class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/builtins/ranges.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
similarity index 91%
rename from generators/src/org/jetbrains/jet/generators/builtins/ranges.kt
rename to generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
index 6e5949e7173..821cbb9fefa 100644
--- a/generators/src/org/jetbrains/jet/generators/builtins/ranges.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.ranges
+package org.jetbrains.kotlin.generators.builtins.ranges
 
-import org.jetbrains.jet.generators.builtins.*
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.*
-import org.jetbrains.jet.generators.builtins.ProgressionKind.*
+import org.jetbrains.kotlin.generators.builtins.*
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.*
+import org.jetbrains.kotlin.generators.builtins.ProgressionKind.*
 import java.io.PrintWriter
 
 class GenerateRanges(out: PrintWriter) : BuiltInsSourceGenerator(out) {
diff --git a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
similarity index 96%
rename from generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
rename to generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
index a5b59fc2565..d94be2678ff 100644
--- a/generators/src/org/jetbrains/jet/generators/evaluate/GenerateOperationsMap.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.evaluate
+package org.jetbrains.kotlin.generators.evaluate
 
 import java.io.File
 import com.intellij.openapi.util.io.FileUtil
@@ -42,7 +42,7 @@ fun generate(): String {
     p.println("import java.math.BigInteger")
     p.println("import java.util.HashMap")
     p.println()
-    p.println("/** This file is generated by org.jetbrains.jet.generators.evaluate:generate(). DO NOT MODIFY MANUALLY */")
+    p.println("/** This file is generated by org.jetbrains.kotlin.generators.evaluate:generate(). DO NOT MODIFY MANUALLY */")
     p.println()
 
     val unaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
diff --git a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
similarity index 94%
rename from generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java
rename to generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
index 60246b1acfc..eaac575043b 100644
--- a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java
+++ b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.frontend;
+package org.jetbrains.kotlin.generators.frontend;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.tree.IElementType;
@@ -45,7 +45,7 @@ public class GenerateKeywordStrings {
         p.println("import java.util.Set;");
         p.println("import java.util.HashSet;");
         p.println();
-        p.println("/** This class is generated by {@link \"org.jetbrains.jet.generators.frontend.GenerateKeywordStrings\"}. DO NOT MODIFY MANUALLY */");
+        p.println("/** This class is generated by {@link \"org.jetbrains.kotlin.generators.frontend.GenerateKeywordStrings\"}. DO NOT MODIFY MANUALLY */");
         p.println("public class KeywordStringsGenerated {");
         p.pushIndent();
         p.println("private KeywordStringsGenerated() {}");
diff --git a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
similarity index 98%
rename from generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
rename to generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
index 735cd42a860..2912fdb5e53 100644
--- a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.injectors
+package org.jetbrains.kotlin.generators.injectors
 
 import com.intellij.openapi.project.Project
 import org.jetbrains.jet.context.GlobalContext
@@ -312,4 +312,4 @@ private fun generator(
         injectorPackageName: String,
         injectorClassName: String,
         body: DependencyInjectorGenerator.() -> Unit
-) = generator(targetSourceRoot, injectorPackageName, injectorClassName, "org.jetbrains.jet.generators.injectors.InjectorsPackage", body)
+) = generator(targetSourceRoot, injectorPackageName, injectorClassName, "org.jetbrains.kotlin.generators.injectors.InjectorsPackage", body)
diff --git a/generators/src/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java b/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
similarity index 99%
rename from generators/src/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java
rename to generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
index 1972bd824d9..e8136ef26ef 100644
--- a/generators/src/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java
+++ b/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.mockJDK;
+package org.jetbrains.kotlin.generators.mockJDK;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
diff --git a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
similarity index 97%
rename from generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt
rename to generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index fc014c53726..4601c889f4f 100644
--- a/generators/src/org/jetbrains/jet/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.protobuf
+package org.jetbrains.kotlin.generators.protobuf
 
 import com.intellij.execution.util.ExecUtil
 import java.io.File
diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
similarity index 99%
rename from generators/src/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
index ac3278349ee..6efd2bd6072 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests;
+package org.jetbrains.kotlin.generators.tests;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
similarity index 98%
rename from generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
rename to generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e943a155eaf..39b09409ada 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests
+package org.jetbrains.kotlin.generators.tests
 
-import org.jetbrains.jet.generators.tests.generator.TestGenerator
-import org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend
+import org.jetbrains.kotlin.generators.tests.generator.TestGenerator
+import org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend
 import java.util.ArrayList
-import org.jetbrains.jet.generators.tests.generator.SimpleTestClassModel
+import org.jetbrains.kotlin.generators.tests.generator.SimpleTestClassModel
 import java.io.File
 import java.util.regex.Pattern
 import junit.framework.TestCase
@@ -73,12 +73,12 @@ import org.jetbrains.jet.resolve.annotation.AbstractAnnotationParameterTest
 import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest
 import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
-import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel
-import org.jetbrains.jet.generators.tests.generator.TestClassModel
+import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
+import org.jetbrains.kotlin.generators.tests.generator.TestClassModel
 import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest
 import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
-import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil
+import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
 import org.jetbrains.jet.resolve.AbstractAdditionalResolveDescriptorRendererTest
 import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest
 import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest
@@ -119,7 +119,7 @@ import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest
 import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
 import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
-import org.jetbrains.jet.generators.tests.reservedWords.generateTestDataForReservedWords
+import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
 import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest
 import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest
 import org.jetbrains.k2js.test.semantics.AbstractBridgeTest
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
similarity index 99%
rename from generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt
rename to generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
index c3def4ec6c3..2ec487aba85 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generateTestDataForReservedWords.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.reservedWords
+package org.jetbrains.kotlin.generators.tests.reservedWords
 
 import java.io.File
 import org.jetbrains.jet.renderer.KeywordStringsGenerated
@@ -366,4 +366,4 @@ class CyclicStream<T>(val c: List<T>) : Stream<T> {
     }
 
     override fun iterator(): Iterator<T> = iterator
-}
\ No newline at end of file
+}
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.java
similarity index 60%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.java
index 4d820c410f9..a3c8b231de7 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/DelegatingTestClassModel.java
@@ -1,20 +1,20 @@
 /*
-* Copyright 2010-2013 JetBrains s.r.o.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java
similarity index 97%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java
index 7053cb8bea9..bbb2d9e571d 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
@@ -32,7 +32,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend;
+import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
 
 public class SimpleTestClassModel implements TestClassModel {
     private static final Comparator<TestEntityModel> BY_NAME = new Comparator<TestEntityModel>() {
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java
similarity index 95%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java
index 2276bda04e8..8dbf9cfcf94 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend;
+import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
 
 public class SimpleTestMethodModel implements TestMethodModel {
     @NotNull
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/SingleClassTestModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java
similarity index 96%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/SingleClassTestModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java
index f991c3758e9..d9569f47154 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/SingleClassTestModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
@@ -33,7 +33,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static org.jetbrains.jet.generators.tests.generator.TestGenerator.TargetBackend;
+import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
 
 public class SingleClassTestModel implements TestClassModel {
     @NotNull
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestClassModel.java
similarity index 90%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/TestClassModel.java
index ea66ff8eabf..def1cc64b16 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestClassModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestEntityModel.java
similarity index 87%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/TestEntityModel.java
index c02ea4f7576..4f2e2fee231 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestEntityModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java
similarity index 98%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java
index 86f7b62f66d..75bdd723b93 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java
similarity index 93%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java
index 2529536c992..d7ebfc91e2e 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
diff --git a/generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestMethodModel.java
similarity index 88%
rename from generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java
rename to generators/src/org/jetbrains/kotlin/generators/tests/generator/TestMethodModel.java
index 57772fb8f05..673de5a35b4 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestMethodModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.tests.generator;
+package org.jetbrains.kotlin.generators.tests.generator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.Printer;
diff --git a/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt
similarity index 88%
rename from generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt
rename to generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt
index 6cb4b29e307..8052cf61289 100644
--- a/generators/tests/org/jetbrains/jet/generators/builtins/GenerateBuiltInsTest.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.builtins.test
+package org.jetbrains.kotlin.generators.builtins.test
 
 import java.io.PrintWriter
-import org.jetbrains.jet.generators.builtins.generateBuiltIns.generateBuiltIns
+import org.jetbrains.kotlin.generators.builtins.generateBuiltIns.generateBuiltIns
 import java.io.StringWriter
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.openapi.util.io.FileUtil
diff --git a/generators/tests/org/jetbrains/jet/generators/evaluate/GenerateOperationsMapTest.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
similarity index 86%
rename from generators/tests/org/jetbrains/jet/generators/evaluate/GenerateOperationsMapTest.kt
rename to generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
index 9cdd793aeb4..8f8de683971 100644
--- a/generators/tests/org/jetbrains/jet/generators/evaluate/GenerateOperationsMapTest.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.test.evaluate
+package org.jetbrains.kotlin.generators.test.evaluate
 
 import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.jet.JetTestUtils
-import org.jetbrains.jet.generators.evaluate
+import org.jetbrains.kotlin.generators.evaluate
 
 public class GenerateOperationsMapTest() : UsefulTestCase() {
     public fun testGeneratedDataIsUpToDate(): Unit {
diff --git a/generators/tests/org/jetbrains/jet/generators/frontend/GenerateKeywordStringsTest.java b/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStringsTest.java
similarity index 92%
rename from generators/tests/org/jetbrains/jet/generators/frontend/GenerateKeywordStringsTest.java
rename to generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStringsTest.java
index 56a1699c66b..10bf4ac8634 100644
--- a/generators/tests/org/jetbrains/jet/generators/frontend/GenerateKeywordStringsTest.java
+++ b/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStringsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.frontend;
+package org.jetbrains.kotlin.generators.frontend;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/generators/tests/org/jetbrains/jet/generators/injectors/GenerateInjectorsTest.java b/generators/tests/org/jetbrains/kotlin/generators/injectors/GenerateInjectorsTest.java
similarity index 95%
rename from generators/tests/org/jetbrains/jet/generators/injectors/GenerateInjectorsTest.java
rename to generators/tests/org/jetbrains/kotlin/generators/injectors/GenerateInjectorsTest.java
index c6359ec7c81..bc9fbe138b1 100644
--- a/generators/tests/org/jetbrains/jet/generators/injectors/GenerateInjectorsTest.java
+++ b/generators/tests/org/jetbrains/kotlin/generators/injectors/GenerateInjectorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.injectors;
+package org.jetbrains.kotlin.generators.injectors;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
diff --git a/generators/tests/org/jetbrains/jet/generators/protobuf/ProtoBufConsistencyTest.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt
similarity index 96%
rename from generators/tests/org/jetbrains/jet/generators/protobuf/ProtoBufConsistencyTest.kt
rename to generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt
index ea73b8ae223..49213a0be89 100644
--- a/generators/tests/org/jetbrains/jet/generators/protobuf/ProtoBufConsistencyTest.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufConsistencyTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.generators.protobuf
+package org.jetbrains.kotlin.generators.protobuf
 
 import junit.framework.TestCase
 import com.google.protobuf.GeneratedMessage.GeneratedExtension