diff --git a/compiler/psi/src/org/jetbrains/kotlin/kdoc/lexer/KDocToken.java b/compiler/psi/src/org/jetbrains/kotlin/kdoc/lexer/KDocToken.java
index 5ce83b73ca7..ea932870ebe 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/kdoc/lexer/KDocToken.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/kdoc/lexer/KDocToken.java
@@ -21,6 +21,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.lexer.KtToken;
 
 public class KDocToken extends KtToken {
+    @Deprecated
+    public KDocToken(@NotNull @NonNls String debugName) {
+        super(debugName);
+    }
+
     public KDocToken(@NotNull @NonNls String debugName, int tokenId) {
         super(debugName, tokenId);
     }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtKeywordToken.java b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtKeywordToken.java
index 9dca66addeb..4d1365530b9 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtKeywordToken.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtKeywordToken.java
@@ -24,10 +24,20 @@ public class KtKeywordToken extends KtSingleValueToken {
     /**
      * Generate keyword (identifier that has a keyword meaning in all possible contexts)
      */
+    @Deprecated
+    public static KtKeywordToken keyword(String value) {
+        return keyword(value, value);
+    }
+
     public static KtKeywordToken keyword(String value, int tokenId) {
         return keyword(value, value, tokenId);
     }
 
+    @Deprecated
+    public static KtKeywordToken keyword(String debugName, String value) {
+        return new KtKeywordToken(debugName, value, false);
+    }
+
     public static KtKeywordToken keyword(String debugName, String value, int tokenId) {
         return new KtKeywordToken(debugName, value, false, tokenId);
     }
@@ -35,12 +45,23 @@ public class KtKeywordToken extends KtSingleValueToken {
     /**
      * Generate soft keyword (identifier that has a keyword meaning only in some contexts)
      */
+    @Deprecated
+    public static KtKeywordToken softKeyword(String value) {
+        return new KtKeywordToken(value, value, true);
+    }
+
     public static KtKeywordToken softKeyword(String value, int tokenId) {
         return new KtKeywordToken(value, value, true, tokenId);
     }
 
     private final boolean myIsSoft;
 
+    @Deprecated
+    protected KtKeywordToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, boolean isSoft) {
+        super(debugName, value);
+        myIsSoft = isSoft;
+    }
+
     protected KtKeywordToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, boolean isSoft, int tokenId) {
         super(debugName, value, tokenId);
         myIsSoft = isSoft;
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtModifierKeywordToken.java b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtModifierKeywordToken.java
index 61b4dd632e1..e1410f2e841 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtModifierKeywordToken.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtModifierKeywordToken.java
@@ -25,6 +25,11 @@ public final class KtModifierKeywordToken extends KtKeywordToken {
     /**
      * Generate keyword (identifier that has a keyword meaning in all possible contexts)
      */
+    @Deprecated
+    public static KtModifierKeywordToken keywordModifier(String value) {
+        return new KtModifierKeywordToken(value, value, false);
+    }
+
     public static KtModifierKeywordToken keywordModifier(String value, int tokenId) {
         return new KtModifierKeywordToken(value, value, false, tokenId);
     }
@@ -32,10 +37,20 @@ public final class KtModifierKeywordToken extends KtKeywordToken {
     /**
      * Generate soft keyword (identifier that has a keyword meaning only in some contexts)
      */
+    @Deprecated
+    public static KtModifierKeywordToken softKeywordModifier(String value) {
+        return new KtModifierKeywordToken(value, value, true);
+    }
+
     public static KtModifierKeywordToken softKeywordModifier(String value, int tokenId) {
         return new KtModifierKeywordToken(value, value, true, tokenId);
     }
 
+    @Deprecated
+    private KtModifierKeywordToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, boolean isSoft) {
+        super(debugName, value, isSoft);
+    }
+
     private KtModifierKeywordToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, boolean isSoft, int tokenId) {
         super(debugName, value, isSoft, tokenId);
     }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtSingleValueToken.java b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtSingleValueToken.java
index 310303f0354..b51d0947f9b 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtSingleValueToken.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtSingleValueToken.java
@@ -22,6 +22,12 @@ import org.jetbrains.annotations.NotNull;
 public class KtSingleValueToken extends KtToken {
     private final String myValue;
 
+    @Deprecated
+    public KtSingleValueToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value) {
+        super(debugName);
+        myValue = value;
+    }
+
     public KtSingleValueToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, int tokenId) {
         super(debugName, tokenId);
         myValue = value;
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtToken.java b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtToken.java
index 90d5983b635..cbe52f22cd9 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/KtToken.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/KtToken.java
@@ -22,8 +22,15 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
 
 public class KtToken extends IElementType {
+    private static final int INVALID_ID = -1;
+
     public final int tokenId;
 
+    @Deprecated
+    public KtToken(@NotNull @NonNls String debugName) {
+        this(debugName, INVALID_ID);
+    }
+
     public KtToken(@NotNull @NonNls String debugName, int tokenId) {
         super(debugName, KotlinLanguage.INSTANCE);
         this.tokenId = tokenId;