diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
index bfce29b3455..3227b0d1e1c 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinIdeaCoreBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinIdeaCoreBundle"
 
 object KotlinIdeaCoreBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
index 8fcf7ca29f5..11923241ea4 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinIdeaGradleBundle"
 
 object KotlinIdeaGradleBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
index b85396f59a5..a16f2a3779d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinConfigurationBundle"
 
 object KotlinConfigurationBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
index 8ece7f20b13..235f95324d1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinCopyBundle"
 
 object KotlinCopyBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
index fc448f91c75..39179c19096 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinEditorBundle"
 
 object KotlinEditorBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
index 937589fe073..b68f57030f3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinFacetBundle"
 
 object KotlinFacetBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
index 0badb16a1d7..a9ca70e8b38 100644
--- a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinFiltersBundle"
 
 object KotlinFiltersBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
index 2cf9b2c88f0..f27c1dd706e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
@@ -14,8 +14,8 @@ private const val BUNDLE = "messages.KotlinFindUsagesBundle"
 
 object KotlinFindUsagesBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 
     @JvmStatic
-    fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
+    fun lazyMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
index 4c22fc75e97..6402fd9da00 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinFormatterBundle"
 
 object KotlinFormatterBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
index ce2f6337655..28e0e15e429 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinFrameworkBundle"
 
 object KotlinFrameworkBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
index 185c82817e2..dbc7d352651 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinHierarchyBundle"
 
 object KotlinHierarchyBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
index 8d5878685c4..4b0b74adb5a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinHighlighterBundle"
 
 object KotlinHighlighterBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
index d8e167e7244..93b98ee748e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinImportsBundle"
 
 object KotlinImportsBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
index 482e542750f..9e784838618 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinInternalBundle"
 
 object KotlinInternalBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
index 403c2560e31..62d312d8f2d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinReporterBundle"
 
 object KotlinReporterBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
index f6193edf532..76b797c3284 100644
--- a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinRootsBundle"
 
 object KotlinRootsBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt b/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
index a501296c34f..86075682059 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinScriptBundle"
 
 object KotlinScriptBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
index 4fe741b08bb..9de8ed60dd1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinSlicerBundle"
 
 object KotlinSlicerBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
index 8b71a0e7442..01408d47260 100644
--- a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinTestIntegrationBundle"
 
 object KotlinTestIntegrationBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt b/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
index acb43ec9bbb..06736a918ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinUpdateBundle"
 
 object KotlinUpdateBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt
index df08a75d272..088fa90984f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinVersionBundle"
 
 object KotlinVersionBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/KotlinJ2KBundle.kt b/j2k/src/org/jetbrains/kotlin/j2k/KotlinJ2KBundle.kt
index 6809ff38ab0..c5629ca6ea3 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/KotlinJ2KBundle.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/KotlinJ2KBundle.kt
@@ -14,5 +14,5 @@ private const val BUNDLE = "messages.KotlinJ2KBundle"
 
 object KotlinJ2KBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }