diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
index 9c7bcbb00bc..7ab8a3bf6f4 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt
@@ -40,7 +40,8 @@ object KeywordLookupObject
 object KeywordCompletion {
     private val NON_ACTUAL_KEYWORDS = setOf(REIFIED_KEYWORD,
                                             CAPITALIZED_THIS_KEYWORD,
-                                            TYPE_ALIAS_KEYWORD)
+                                            TYPE_ALIAS_KEYWORD,
+                                            TRAIT_KEYWORD)
     private val ALL_KEYWORDS = (KEYWORDS.getTypes() + SOFT_KEYWORDS.getTypes())
             .filter { it !in NON_ACTUAL_KEYWORDS }
             .map { it as JetKeywordToken }
diff --git a/idea/idea-completion/testData/keywords/AfterClassProperty.kt b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
index beda7535e60..d68173bfc94 100644
--- a/idea/idea-completion/testData/keywords/AfterClassProperty.kt
+++ b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
@@ -25,7 +25,7 @@ class MouseMovedEventArgs
 // EXIST:  protected
 // EXIST:  public
 // EXIST: set
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/AfterClasses.kt b/idea/idea-completion/testData/keywords/AfterClasses.kt
index a821032504a..f0bcc0df2ea 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses.kt
@@ -30,7 +30,7 @@ class B {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/AfterFuns.kt b/idea/idea-completion/testData/keywords/AfterFuns.kt
index 9bbc53e3082..9d1f7ba667b 100644
--- a/idea/idea-completion/testData/keywords/AfterFuns.kt
+++ b/idea/idea-completion/testData/keywords/AfterFuns.kt
@@ -28,7 +28,7 @@ class A {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
index 097d8aa627c..b78b93f3af0 100644
--- a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
@@ -30,7 +30,7 @@ var a : Int
 // EXIST:  protected
 // EXIST:  public
 // EXIST: set
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
index 63940445f75..da74fb17f8c 100644
--- a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
+++ b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
@@ -26,7 +26,7 @@ public class Test {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/InClassScope.kt b/idea/idea-completion/testData/keywords/InClassScope.kt
index 53200a3b8a3..3f04fae7f85 100644
--- a/idea/idea-completion/testData/keywords/InClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InClassScope.kt
@@ -20,7 +20,7 @@ class TestClass {
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/InCodeBlock.kt b/idea/idea-completion/testData/keywords/InCodeBlock.kt
index 1c03bde1ebc..11a85849c71 100644
--- a/idea/idea-completion/testData/keywords/InCodeBlock.kt
+++ b/idea/idea-completion/testData/keywords/InCodeBlock.kt
@@ -14,7 +14,7 @@ fun foo() {
 // EXIST: return
 // EXIST: super
 // EXIST: throw
-// EXIST: trait
+// EXIST: interface
 // EXIST: true
 // EXIST: try
 // EXIST: val
diff --git a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
index f018650fe90..626ba8e340d 100644
--- a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
+++ b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
@@ -21,7 +21,7 @@ package Test
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors.kt b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
index 2982518cb40..1a5fd10e14f 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
@@ -24,7 +24,7 @@ class Some {
 // EXIST:  protected
 // EXIST:  public
 // EXIST: set
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
index 1a8f62d15ee..a59fc204e7b 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
@@ -24,7 +24,7 @@ class Some {
 // EXIST:  protected
 // EXIST:  public
 // EXIST: set
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/PropertySetter.kt b/idea/idea-completion/testData/keywords/PropertySetter.kt
index 84b140907bc..26cfa1eac80 100644
--- a/idea/idea-completion/testData/keywords/PropertySetter.kt
+++ b/idea/idea-completion/testData/keywords/PropertySetter.kt
@@ -26,7 +26,7 @@ class Some {
 // EXIST:  protected
 // EXIST:  public
 // EXIST: set
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg
diff --git a/idea/idea-completion/testData/keywords/TopScope.kt b/idea/idea-completion/testData/keywords/TopScope.kt
index 028eb9b1526..d7650ab8e26 100644
--- a/idea/idea-completion/testData/keywords/TopScope.kt
+++ b/idea/idea-completion/testData/keywords/TopScope.kt
@@ -20,7 +20,7 @@
 // EXIST:  private
 // EXIST:  protected
 // EXIST:  public
-// EXIST:  trait
+// EXIST:  interface
 // EXIST:  val
 // EXIST:  var
 // EXIST:  vararg