diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
index c2cb7d01223..e9d19046501 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetBlockCodeFragmentType extends JetFileElementType {
-    private static final String NAME = "jet.BLOCK_CODE_FRAGMENT";
+    private static final String NAME = "kotlin.BLOCK_CODE_FRAGMENT";
 
     public JetBlockCodeFragmentType() {
         super(NAME);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
index cd62ee03b6a..ccf7a8ef1ae 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetExpressionCodeFragmentType extends JetFileElementType {
-    private static final String NAME = "jet.EXPRESSION_CODE_FRAGMENT";
+    private static final String NAME = "kotlin.EXPRESSION_CODE_FRAGMENT";
 
     public JetExpressionCodeFragmentType() {
         super(NAME);
@@ -47,4 +47,3 @@ public class JetExpressionCodeFragmentType extends JetFileElementType {
         return JetParser.parseExpressionCodeFragment(builder).getFirstChildNode();
     }
 }
-
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
index 771766bd19b..14862e9846a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetTypeCodeFragmentType extends JetFileElementType {
-    private static final String NAME = "jet.TYPE_CODE_FRAGMENT";
+    private static final String NAME = "kotlin.TYPE_CODE_FRAGMENT";
 
     public JetTypeCodeFragmentType() {
         super(NAME);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
index 614b47a35ff..0cffb721ea1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
@@ -36,10 +36,12 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
 import java.io.IOException;
 
 public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
-    public static final int STUB_VERSION = 34;
+    public static final int STUB_VERSION = 35;
+
+    private static final String NAME = "kotlin.FILE";
 
     public JetFileElementType() {
-        super("jet.FILE", JetLanguage.INSTANCE);
+        super(NAME, JetLanguage.INSTANCE);
     }
 
     protected JetFileElementType(@NonNls String debugName) {
@@ -59,7 +61,7 @@ public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
     @NotNull
     @Override
     public String getExternalId() {
-        return "jet.FILE";
+        return NAME;
     }
 
     @Override
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java
index 8a22846245b..d4d0eb83c1b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java
@@ -85,7 +85,7 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
     @NotNull
     @Override
     public String getExternalId() {
-        return "jet." + toString();
+        return "kotlin." + toString();
     }
 
     @Override