diff --git a/grammar/buildGrammarLexer.xml b/grammar/buildGrammarLexer.xml
index c760bf3f503..58411477329 100644
--- a/grammar/buildGrammarLexer.xml
+++ b/grammar/buildGrammarLexer.xml
@@ -34,7 +34,7 @@
     </macrodef>
 
     <target name="lexer">
-        <flex flexfile="${home}/src/org/jetbrains/jet/grammar/Grammar.flex"
-              destdir="${home}//src/org/jetbrains/jet/grammar/"/>
+        <flex flexfile="${home}/src/org/jetbrains/kotlin/grammar/Grammar.flex"
+              destdir="${home}//src/org/jetbrains/kotlin/grammar/"/>
     </target>
 </project>
diff --git a/grammar/src/org/jetbrains/jet/grammar/Annotation.java b/grammar/src/org/jetbrains/kotlin/grammar/Annotation.java
similarity index 91%
rename from grammar/src/org/jetbrains/jet/grammar/Annotation.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Annotation.java
index 6fbec2d7530..bc78625b4e4 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Annotation.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Annotation.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Annotation extends Token {
     public Annotation(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/Comment.java b/grammar/src/org/jetbrains/kotlin/grammar/Comment.java
similarity index 91%
rename from grammar/src/org/jetbrains/jet/grammar/Comment.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Comment.java
index 81632767e35..806c4908848 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Comment.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Comment.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Comment extends Token {
     public Comment(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java b/grammar/src/org/jetbrains/kotlin/grammar/ConfluenceHyperlinksGenerator.java
similarity index 98%
rename from grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java
rename to grammar/src/org/jetbrains/kotlin/grammar/ConfluenceHyperlinksGenerator.java
index ab1d14cfed7..a121a9b8d92 100644
--- a/grammar/src/org/jetbrains/jet/grammar/ConfluenceHyperlinksGenerator.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/ConfluenceHyperlinksGenerator.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.*;
diff --git a/grammar/src/org/jetbrains/jet/grammar/Declaration.java b/grammar/src/org/jetbrains/kotlin/grammar/Declaration.java
similarity index 92%
rename from grammar/src/org/jetbrains/jet/grammar/Declaration.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Declaration.java
index 3f8abb3608f..f7589a767a9 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Declaration.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Declaration.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Declaration extends Token {
     private final String name;
diff --git a/grammar/src/org/jetbrains/jet/grammar/DocComment.java b/grammar/src/org/jetbrains/kotlin/grammar/DocComment.java
similarity index 91%
rename from grammar/src/org/jetbrains/jet/grammar/DocComment.java
rename to grammar/src/org/jetbrains/kotlin/grammar/DocComment.java
index 324cffd372c..5b0409c1e78 100644
--- a/grammar/src/org/jetbrains/jet/grammar/DocComment.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/DocComment.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class DocComment extends Token {
     public DocComment(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/Grammar.flex b/grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex
similarity index 99%
rename from grammar/src/org/jetbrains/jet/grammar/Grammar.flex
rename to grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex
index 1d908b7365e..1ddcd948d2f 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Grammar.flex
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex
@@ -1,5 +1,5 @@
 /* It's an automatically generated code. Do not modify it. */
-package org.jetbrains.jet.grammar;
+package org.jetbrains.kotlin.grammar;
 
 //import com.intellij.lexer.*;
 //import com.intellij.psi.*;
diff --git a/grammar/src/org/jetbrains/jet/grammar/Identifier.java b/grammar/src/org/jetbrains/kotlin/grammar/Identifier.java
similarity index 92%
rename from grammar/src/org/jetbrains/jet/grammar/Identifier.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Identifier.java
index 9faa9567be1..102f0c7e449 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Identifier.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Identifier.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Identifier extends Token {
     private final String name;
diff --git a/grammar/src/org/jetbrains/jet/grammar/Other.java b/grammar/src/org/jetbrains/kotlin/grammar/Other.java
similarity index 90%
rename from grammar/src/org/jetbrains/jet/grammar/Other.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Other.java
index 6e654292673..9b0ba37a8d3 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Other.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Other.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Other extends Token {
     public Other(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/StringToken.java b/grammar/src/org/jetbrains/kotlin/grammar/StringToken.java
similarity index 93%
rename from grammar/src/org/jetbrains/jet/grammar/StringToken.java
rename to grammar/src/org/jetbrains/kotlin/grammar/StringToken.java
index 71be17323e8..ba1d170d8fd 100644
--- a/grammar/src/org/jetbrains/jet/grammar/StringToken.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/StringToken.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class StringToken extends Token {
     public StringToken(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/SymbolToken.java b/grammar/src/org/jetbrains/kotlin/grammar/SymbolToken.java
similarity index 91%
rename from grammar/src/org/jetbrains/jet/grammar/SymbolToken.java
rename to grammar/src/org/jetbrains/kotlin/grammar/SymbolToken.java
index 843c44b7010..32227f2b855 100644
--- a/grammar/src/org/jetbrains/jet/grammar/SymbolToken.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/SymbolToken.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class SymbolToken extends Token {
     public SymbolToken(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/Token.java b/grammar/src/org/jetbrains/kotlin/grammar/Token.java
similarity index 93%
rename from grammar/src/org/jetbrains/jet/grammar/Token.java
rename to grammar/src/org/jetbrains/kotlin/grammar/Token.java
index fad63c98d7a..0fb6a69fc56 100644
--- a/grammar/src/org/jetbrains/jet/grammar/Token.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/Token.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class Token {
     private final String fileName;
diff --git a/grammar/src/org/jetbrains/jet/grammar/WhiteSpace.java b/grammar/src/org/jetbrains/kotlin/grammar/WhiteSpace.java
similarity index 91%
rename from grammar/src/org/jetbrains/jet/grammar/WhiteSpace.java
rename to grammar/src/org/jetbrains/kotlin/grammar/WhiteSpace.java
index 7fdb5952c30..80a40167fa2 100644
--- a/grammar/src/org/jetbrains/jet/grammar/WhiteSpace.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/WhiteSpace.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.grammar;
+package org.jetbrains.kotlin.grammar;
 
 public class WhiteSpace extends Token {
     public WhiteSpace(CharSequence text, String fileName, int line) {
diff --git a/grammar/src/org/jetbrains/jet/grammar/_GrammarLexer.java b/grammar/src/org/jetbrains/kotlin/grammar/_GrammarLexer.java
similarity index 97%
rename from grammar/src/org/jetbrains/jet/grammar/_GrammarLexer.java
rename to grammar/src/org/jetbrains/kotlin/grammar/_GrammarLexer.java
index b176e64ddf6..3c5c041579c 100644
--- a/grammar/src/org/jetbrains/jet/grammar/_GrammarLexer.java
+++ b/grammar/src/org/jetbrains/kotlin/grammar/_GrammarLexer.java
@@ -1,7 +1,7 @@
-/* The following code was generated by JFlex 1.4.3 on 8/31/12 4:09 PM */
+/* The following code was generated by JFlex 1.4.3 on 1/3/15 1:59 PM */
 
 /* It's an automatically generated code. Do not modify it. */
-package org.jetbrains.jet.grammar;
+package org.jetbrains.kotlin.grammar;
 
 //import com.intellij.lexer.*;
 //import com.intellij.psi.*;
@@ -13,8 +13,8 @@ package org.jetbrains.jet.grammar;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 8/31/12 4:09 PM from the specification file
- * <tt>/Users/abreslav/work/kotlin/grammar/src/org/jetbrains/jet/grammar/Grammar.flex</tt>
+ * on 1/3/15 1:59 PM from the specification file
+ * <tt>/Users/udalov/kotlin/grammar/src/org/jetbrains/kotlin/grammar/Grammar.flex</tt>
  */
 class _GrammarLexer {
   /** initial size of the lookahead buffer */
@@ -538,7 +538,7 @@ class _GrammarLexer {
         while (true) {
 
           if (zzCurrentPosL < zzEndReadL)
-            zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
+            zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
           else if (zzAtEOF) {
             zzInput = YYEOF;
             break zzForAction;
@@ -558,7 +558,7 @@ class _GrammarLexer {
               break zzForAction;
             }
             else {
-              zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
+              zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
             }
           }
           int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];