diff --git a/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java
index b3327cec43a..38e2a51a9d3 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.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.resolve;
+package org.jetbrains.kotlin.resolve;
 
 import com.intellij.openapi.project.Project;
 import org.jetbrains.kotlin.psi.JetFile;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java
index bb397857891..827b52b4527 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.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.resolve;
+package org.jetbrains.kotlin.resolve;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Maps;
@@ -27,21 +27,19 @@ import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
-import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
+import org.jetbrains.kotlin.psi.*;
+import org.jetbrains.kotlin.renderer.DescriptorRenderer;
+import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.types.ErrorUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeConstructor;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 
 import java.util.List;
 import java.util.Map;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java
index 5f449887b64..e340fac59f1 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.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.resolve;
+package org.jetbrains.kotlin.resolve;
 
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java
index 2413555b5b0..5191db4e264 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.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.resolve;
+package org.jetbrains.kotlin.resolve;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.BindingTraceContext;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt
similarity index 89%
rename from compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt
index dbe5f5b6865..6b0bdf37e98 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.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,17 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve
+package org.jetbrains.kotlin.resolve
 
-import org.jetbrains.kotlin.resolve.BindingTraceContext
-import org.jetbrains.kotlin.resolve.DelegatingBindingTrace
 import org.junit.Assert
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment
 import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
 import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
@@ -69,15 +66,15 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() {
         middle.reportDiagnostic()
         derived.reportDiagnostic()
 
-        Assert.assertEquals(1, base.diagnostics.all().size)
-        Assert.assertEquals(2, middle.diagnostics.all().size)
-        Assert.assertEquals(3, derived.diagnostics.all().size)
+        Assert.assertEquals(1, base.diagnostics.all().size())
+        Assert.assertEquals(2, middle.diagnostics.all().size())
+        Assert.assertEquals(3, derived.diagnostics.all().size())
 
         middle.clear()
 
-        Assert.assertEquals(1, base.diagnostics.all().size)
-        Assert.assertEquals(1, middle.diagnostics.all().size)
-        Assert.assertEquals(2, derived.diagnostics.all().size)
+        Assert.assertEquals(1, base.diagnostics.all().size())
+        Assert.assertEquals(1, middle.diagnostics.all().size())
+        Assert.assertEquals(2, derived.diagnostics.all().size())
     }
 
     fun testCaching() {
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java
index 94f8cd0ef85..e79ae014a35 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve;
+package org.jetbrains.kotlin.resolve;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
index 5f8484338f7..69f199b1643 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.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,8 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve.annotation;
-
+package org.jetbrains.kotlin.resolve.annotation;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
@@ -47,9 +46,9 @@ import java.util.List;
 
 public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFixture {
     private static final DescriptorRenderer WITH_ANNOTATION_ARGUMENT_TYPES = new DescriptorRendererBuilder()
-                                                                                    .setVerbose(true)
-                                                                                    .setShortNames(true)
-                                                                                    .build();
+            .setVerbose(true)
+            .setShortNames(true)
+            .build();
 
     private static final String PATH = "compiler/testData/resolveAnnotations/testFile.kt";
 
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt
similarity index 90%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt
index d3bc5c505fa..8a7de52ce25 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.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.resolve.annotation
+package org.jetbrains.kotlin.resolve.annotation
 
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -27,7 +27,7 @@ public abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescri
         val packageView = getPackage(fileText)
         val classDescriptor = AbstractAnnotationDescriptorResolveTest.getClassDescriptor(packageView, "MyClass")
 
-        val expected = InTextDirectivesUtils.findListWithPrefixes(fileText, "// EXPECTED: ").makeString(", ")
+        val expected = InTextDirectivesUtils.findListWithPrefixes(fileText, "// EXPECTED: ").joinToString(", ")
         val actual = AbstractAnnotationDescriptorResolveTest.getAnnotations(classDescriptor)
 
         JetTestUtils.assertEqualsToFile(File(path), fileText.replace(expected, actual))
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java
index 047de71edc8..9ab1f47614f 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.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.resolve.annotation;
+package org.jetbrains.kotlin.resolve.annotation;
 
 import java.io.IOException;
 
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt
similarity index 92%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt
index 9266920cfa0..9898e51b115 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.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.resolve.annotation
+package org.jetbrains.kotlin.resolve.annotation
 
 import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.psi.JetFile
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java
index 48e1a99e47c..6fea1af6a4b 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve.annotation;
+package org.jetbrains.kotlin.resolve.annotation;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt
index a62414b184f..3de44f6f4ca 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.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.resolve.calls
+package org.jetbrains.kotlin.resolve.calls
 
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.JetLiteFixture
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
-
 import java.io.File
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping
@@ -41,7 +40,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
-public abstract class AbstractResolvedCallsTest() : JetLiteFixture() {
+public abstract class AbstractResolvedCallsTest : JetLiteFixture() {
     override fun createEnvironment(): JetCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL)
 
     public fun doTest(filePath: String) {
diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java
index d95f4e577b1..0a301651536 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve.calls;
+package org.jetbrains.kotlin.resolve.calls;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
index 67942be81d9..f113a73afc5 100644
--- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.resolve.constants.evaluate
 
-import org.jetbrains.jet.resolve.annotation.AbstractAnnotationDescriptorResolveTest
+import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationDescriptorResolveTest
 import org.jetbrains.kotlin.resolve.BindingContext
 import java.io.File
 import com.intellij.openapi.util.io.FileUtil
diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt
index 293e1a42816..61ca93578d1 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.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.resolve.constraintSystem
+package org.jetbrains.kotlin.resolve.constraintSystem
 
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.JetLiteFixture
@@ -28,8 +28,8 @@ import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl
 import org.jetbrains.kotlin.types.Variance
 import java.io.File
 import java.util.regex.Pattern
-import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraintKind
-import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraint
+import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraintKind
+import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraint
 import java.util.ArrayList
 import java.util.LinkedHashMap
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
@@ -146,6 +146,3 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() {
 
     private fun getConstraintsText(text: String) = text.substring(0, text.indexOf("type parameter bounds"))
 }
-
-
-
diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
similarity index 96%
rename from compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
index 1e11cbfde66..4800095880f 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.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.resolve.constraintSystem
+package org.jetbrains.kotlin.resolve.constraintSystem
 
 import org.jetbrains.kotlin.test.JetTestUtils
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java
index 50e4f1e5f99..c6ae817ca42 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.resolve.constraintSystem;
+package org.jetbrains.kotlin.resolve.constraintSystem;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.InnerTestClasses;
diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt
similarity index 98%
rename from compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt
rename to compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt
index 5c096babc4c..3471dd2a92b 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.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.resolve.typeApproximation
+package org.jetbrains.kotlin.resolve.typeApproximation
 
 import org.jetbrains.kotlin.test.JetLiteFixture
 import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 6d159f1e4bc..1456c7d72da 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -24,7 +24,7 @@ import java.io.File
 import java.util.regex.Pattern
 import junit.framework.TestCase
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTest
-import org.jetbrains.jet.resolve.AbstractResolveTest
+import org.jetbrains.kotlin.resolve.AbstractResolveTest
 import org.jetbrains.kotlin.parsing.AbstractJetParsingTest
 import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
 import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
@@ -69,9 +69,9 @@ import org.jetbrains.jet.formatter.AbstractJetFormatterTest
 import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest
 import org.jetbrains.jet.plugin.codeInsight.AbstractOutOfBlockModificationTest
 import org.jetbrains.jet.completion.AbstractDataFlowValueRenderingTest
-import org.jetbrains.jet.resolve.annotation.AbstractAnnotationParameterTest
+import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest
 import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest
-import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
+import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
 import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
 import org.jetbrains.kotlin.generators.tests.generator.TestClassModel
@@ -81,7 +81,7 @@ import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
 import org.jetbrains.kotlin.plugin.resolve.AbstractAdditionalResolveDescriptorRendererTest
 import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInLibrarySourcesTest
-import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest
+import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
 import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest
 import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib