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 4146d92bfee..64fa3241dac 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
@@ -58,7 +58,8 @@ object KeywordCompletion {
             ENUM_KEYWORD to CLASS_KEYWORD,
             ANNOTATION_KEYWORD to CLASS_KEYWORD,
             SEALED_KEYWORD to CLASS_KEYWORD,
-            LATEINIT_KEYWORD to VAR_KEYWORD
+            LATEINIT_KEYWORD to VAR_KEYWORD,
+            CONST_KEYWORD to VAL_KEYWORD
     )
 
     private val KEYWORD_CONSTRUCTS = mapOf<KtKeywordToken, String>(
diff --git a/idea/idea-completion/testData/keywords/AfterClassProperty.kt b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
index 5f419b549f7..a30bdffb243 100644
--- a/idea/idea-completion/testData/keywords/AfterClassProperty.kt
+++ b/idea/idea-completion/testData/keywords/AfterClassProperty.kt
@@ -39,7 +39,7 @@ class MouseMovedEventArgs
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/AfterClasses.kt b/idea/idea-completion/testData/keywords/AfterClasses.kt
index ac93c40f3fe..3aca656bfa2 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses.kt
@@ -33,7 +33,7 @@ class B {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
index 14fcbd9e20a..ad5aae063fd 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt
@@ -33,5 +33,5 @@ class B {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
index 39c0e54141f..b5dc0ed468f 100644
--- a/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
+++ b/idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt
@@ -33,7 +33,7 @@ class B {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/AfterFuns.kt b/idea/idea-completion/testData/keywords/AfterFuns.kt
index 327751a170c..cbf0771c700 100644
--- a/idea/idea-completion/testData/keywords/AfterFuns.kt
+++ b/idea/idea-completion/testData/keywords/AfterFuns.kt
@@ -38,7 +38,7 @@ class A {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
index 74c9939836a..c5e78662655 100644
--- a/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt
@@ -37,7 +37,7 @@ var a : Int
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt b/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
index e744f2a53a2..31835556995 100644
--- a/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InAnnotationClassScope.kt
@@ -24,7 +24,7 @@ annotation class Test {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
index 03678180016..ebc3f309894 100644
--- a/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
+++ b/idea/idea-completion/testData/keywords/InClassBeforeFun.kt
@@ -36,7 +36,7 @@ public class Test {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InClassScope.kt b/idea/idea-completion/testData/keywords/InClassScope.kt
index a801ea3d043..27f5b3126f4 100644
--- a/idea/idea-completion/testData/keywords/InClassScope.kt
+++ b/idea/idea-completion/testData/keywords/InClassScope.kt
@@ -30,7 +30,7 @@ class TestClass {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InEnumScope2.kt b/idea/idea-completion/testData/keywords/InEnumScope2.kt
index a811009c077..21576b04020 100644
--- a/idea/idea-completion/testData/keywords/InEnumScope2.kt
+++ b/idea/idea-completion/testData/keywords/InEnumScope2.kt
@@ -24,7 +24,7 @@ enum class Test {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST: fun
 // EXIST:  typealias
diff --git a/idea/idea-completion/testData/keywords/InInterfaceScope.kt b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
index 8ad16dec5e2..5f5ad1fe776 100644
--- a/idea/idea-completion/testData/keywords/InInterfaceScope.kt
+++ b/idea/idea-completion/testData/keywords/InInterfaceScope.kt
@@ -26,7 +26,7 @@ interface Test {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InObjectScope.kt b/idea/idea-completion/testData/keywords/InObjectScope.kt
index 6ba8990a825..b3bd4c8b154 100644
--- a/idea/idea-completion/testData/keywords/InObjectScope.kt
+++ b/idea/idea-completion/testData/keywords/InObjectScope.kt
@@ -27,7 +27,7 @@ object Test {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt b/idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt
index bd6e56ffef5..a36922410e3 100644
--- a/idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt
+++ b/idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt
@@ -17,6 +17,6 @@ class TestSample(<caret>)
 // EXIST: actual
 /* TODO: keywords below should not be here*/
 // EXIST: abstract
-// EXIST: const
+// EXIST: const val
 // EXIST: lateinit var
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
index 6dbcbec8d53..1bf04a103a5 100644
--- a/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
+++ b/idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt
@@ -24,7 +24,7 @@ package Test
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors.kt b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
index 69615cfecaa..429c7adfb9b 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors.kt
@@ -38,7 +38,7 @@ class Some {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
index 2072defdf1d..360230275e1 100644
--- a/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
+++ b/idea/idea-completion/testData/keywords/PropertyAccessors2.kt
@@ -38,7 +38,7 @@ class Some {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/PropertySetter.kt b/idea/idea-completion/testData/keywords/PropertySetter.kt
index 0ba3c5c3b84..daca7165130 100644
--- a/idea/idea-completion/testData/keywords/PropertySetter.kt
+++ b/idea/idea-completion/testData/keywords/PropertySetter.kt
@@ -36,7 +36,7 @@ class Some {
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect
diff --git a/idea/idea-completion/testData/keywords/TopScope.kt b/idea/idea-completion/testData/keywords/TopScope.kt
index 200e492b4ac..fb567e76b67 100644
--- a/idea/idea-completion/testData/keywords/TopScope.kt
+++ b/idea/idea-completion/testData/keywords/TopScope.kt
@@ -23,7 +23,7 @@
 // EXIST:  tailrec
 // EXIST:  external
 // EXIST:  annotation class
-// EXIST:  const
+// EXIST:  const val
 // EXIST:  suspend
 // EXIST:  typealias
 // EXIST:  expect