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 64fa3241dac..fa6e301127f 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
@@ -55,6 +55,7 @@ object KeywordCompletion {
 
     private val COMPOUND_KEYWORDS = mapOf<KtKeywordToken, KtKeywordToken>(
             COMPANION_KEYWORD to OBJECT_KEYWORD,
+            DATA_KEYWORD to CLASS_KEYWORD,
             ENUM_KEYWORD to CLASS_KEYWORD,
             ANNOTATION_KEYWORD to CLASS_KEYWORD,
             SEALED_KEYWORD to CLASS_KEYWORD,
diff --git a/idea/idea-completion/testData/keywords/AfterClassProperty.kt b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
index a30bdffb243..546004a1b2b 100644
--- a/idea/idea-completion/testData/keywords/AfterClassProperty.kt
+++ b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
@@ -34,7 +34,7 @@ class MouseMovedEventArgs
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/AfterClasses.kt b/idea/idea-completion/testData/keywords/AfterClasses.kt
index 3aca656bfa2..527c8b419f6 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses.kt
@@ -28,7 +28,7 @@ class B {
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
index ad5aae063fd..61f2b2e0c6f 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
@@ -28,7 +28,7 @@ class B {
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
index b5dc0ed468f..7d26d17cffc 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
@@ -28,7 +28,7 @@ class B {
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/AfterFuns.kt b/idea/idea-completion/testData/keywords/AfterFuns.kt
index cbf0771c700..088ea6d7b06 100644
--- a/idea/idea-completion/testData/keywords/AfterFuns.kt
+++ b/idea/idea-completion/testData/keywords/AfterFuns.kt
@@ -33,7 +33,7 @@ class A {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
index c5e78662655..4d50db89ac2 100644
--- a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
@@ -32,7 +32,7 @@ var a : Int
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt b/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
index 31835556995..587565318c3 100644
--- a/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
@@ -19,7 +19,7 @@ annotation class Test {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
index ebc3f309894..b85e3b547d3 100644
--- a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
+++ b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
@@ -31,7 +31,7 @@ public class Test {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InClassScope.kt b/idea/idea-completion/testData/keywords/InClassScope.kt
index 27f5b3126f4..d93ad5a1fef 100644
--- a/idea/idea-completion/testData/keywords/InClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InClassScope.kt
@@ -25,7 +25,7 @@ class TestClass {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InEnumScope2.kt b/idea/idea-completion/testData/keywords/InEnumScope2.kt
index 21576b04020..b61f79a002e 100644
--- a/idea/idea-completion/testData/keywords/InEnumScope2.kt
+++ b/idea/idea-completion/testData/keywords/InEnumScope2.kt
@@ -19,7 +19,7 @@ enum class Test {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InInterfaceScope.kt b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
index 5f5ad1fe776..3ee6f264ee9 100644
--- a/idea/idea-completion/testData/keywords/InInterfaceScope.kt
+++ b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
@@ -21,7 +21,7 @@ interface Test {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InObjectScope.kt b/idea/idea-completion/testData/keywords/InObjectScope.kt
index b3bd4c8b154..c938aabd56c 100644
--- a/idea/idea-completion/testData/keywords/InObjectScope.kt
+++ b/idea/idea-completion/testData/keywords/InObjectScope.kt
@@ -22,7 +22,7 @@ object Test {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
index 1bf04a103a5..a0b8094f91a 100644
--- a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
+++ b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
@@ -19,7 +19,7 @@ package Test
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors.kt b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
index 429c7adfb9b..34f65a51e0c 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
@@ -33,7 +33,7 @@ class Some {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
index 360230275e1..c9ff6e1f7d6 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
@@ -33,7 +33,7 @@ class Some {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/PropertySetter.kt b/idea/idea-completion/testData/keywords/PropertySetter.kt
index daca7165130..01217882bfb 100644
--- a/idea/idea-completion/testData/keywords/PropertySetter.kt
+++ b/idea/idea-completion/testData/keywords/PropertySetter.kt
@@ -31,7 +31,7 @@ class Some {
 // EXIST:  infix
 // EXIST:  sealed class
 // EXIST:  lateinit var
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external
diff --git a/idea/idea-completion/testData/keywords/TopScope.kt b/idea/idea-completion/testData/keywords/TopScope.kt
index fb567e76b67..f8fa298a9a0 100644
--- a/idea/idea-completion/testData/keywords/TopScope.kt
+++ b/idea/idea-completion/testData/keywords/TopScope.kt
@@ -18,7 +18,7 @@
 // EXIST:  operator
 // EXIST:  infix
 // EXIST:  sealed class
-// EXIST:  data
+// EXIST:  data class
 // EXIST:  inline
 // EXIST:  tailrec
 // EXIST:  external