diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 7603ba815f5..22a04748eef 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="Kotlin">
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="main" toReformat="true" toShortenFQNames="true"
               value="fun main($ARGS$) {&#10;  $END$&#10;}">
         <variable name="ARGS" expression="kotlinMainArguments()" defaultValue="" alwaysStopAt="false" />
@@ -9,7 +9,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="maina" toReformat="true" toShortenFQNames="true"
               value="fun main(args: Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -17,7 +17,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="maino" toReformat="true" toShortenFQNames="true"
               value="@JvmStatic&#10;fun main(args: Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -48,7 +48,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.soutp"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.soutp"
               name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
         <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
                   name="FORMAT" />
@@ -66,7 +66,7 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.iter"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.iter"
               name="iter" toReformat="true" toShortenFQNames="true"
               value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinVariable()" name="ITERABLE" />
@@ -75,7 +75,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.ifn"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.ifn"
               name="ifn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ == null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinVariable()" name="VAR" />
@@ -83,7 +83,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.inn"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.inn"
               name="inn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ != null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinVariable()" name="VAR" />
@@ -91,7 +91,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.void"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.void"
               name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
@@ -101,7 +101,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun0"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.fun0"
               name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
@@ -111,7 +111,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun1"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.fun1"
               name="fun1" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -124,7 +124,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun2"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.fun2"
               name="fun2" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -140,7 +140,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.interface"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.interface"
               name="interface" toReformat="true" toShortenFQNames="true" value="interface $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -149,7 +149,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.singleton"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.singleton"
               name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -159,7 +159,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.closure"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.closure"
               name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}">
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" />
         <variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" />
@@ -168,7 +168,7 @@
             <option name="KOTLIN_EXPRESSION" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.anonymous"
               name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
@@ -177,7 +177,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exfun"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.exfun"
               name="exfun" toReformat="true" toShortenFQNames="true"
               value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -189,7 +189,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exval"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.exval"
               name="exval" toReformat="true" toShortenFQNames="true"
               value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -200,7 +200,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exvar"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.exvar"
               name="exvar" toReformat="true" toShortenFQNames="true"
               value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -216,7 +216,7 @@
     <!-- Synonyms -->
 
     <!-- Synonym for main -->
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="psvm" toReformat="true" toShortenFQNames="true"
               value="fun main($ARGS$) {&#10;  $END$&#10;}">
         <variable name="ARGS" expression="kotlinMainArguments()" defaultValue="" alwaysStopAt="false" />
@@ -225,7 +225,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="psvma" toReformat="true" toShortenFQNames="true"
               value="fun main(args: Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -233,7 +233,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.main"
               name="psvmo" toReformat="true" toShortenFQNames="true"
               value="@JvmStatic&#10;fun main(args: Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -242,7 +242,7 @@
     </template>
 
     <!-- Synonym for anonymous -->
-    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="messages.KotlinBundle" key="livetemplate.description.anonymous"
               name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
diff --git a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt
index fad1593cce2..5f8d7dd35f3 100644
--- a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt
+++ b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.after.kt
@@ -1,4 +1,4 @@
-// "Add 'JvmDefault' annotation" "true"
+// "Add '@JvmDefault' annotation" "true"
 // COMPILER_ARGUMENTS: -Xjvm-default=enable
 // WITH_RUNTIME
 interface Bar : Foo {
diff --git a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt
index 895bbedf251..bdb2324139d 100644
--- a/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt
+++ b/idea/testData/quickfix/addJvmDefault/javaDefaultOverride.before.Main.kt
@@ -1,4 +1,4 @@
-// "Add 'JvmDefault' annotation" "true"
+// "Add '@JvmDefault' annotation" "true"
 // COMPILER_ARGUMENTS: -Xjvm-default=enable
 // WITH_RUNTIME
 interface Bar : Foo {