diff --git a/idea/resources/messages/KotlinBundle.properties b/idea/resources/messages/KotlinBundle.properties
index bf60febe444..db6c63b2958 100644
--- a/idea/resources/messages/KotlinBundle.properties
+++ b/idea/resources/messages/KotlinBundle.properties
@@ -341,27 +341,20 @@ action.new.file.text=Kotlin File/Class
 action.new.file.description=Creates new Kotlin file or class
 action.new.file.dialog.title=New Kotlin File/Class
 action.new.file.dialog.file.title=File
-action.new.file.dialog.file.description=Kotlin File
 action.new.file.dialog.class.title=Class
-action.new.file.dialog.class.description=Kotlin Class
 action.new.file.dialog.interface.title=Interface
-action.new.file.dialog.interface.description=Kotlin Interface
 action.new.file.dialog.enum.title=Enum class
-action.new.file.dialog.enum.description=Kotlin Enum
 action.new.file.dialog.object.title=Object
-action.new.file.dialog.object.description=Kotlin Object
 action.new.file.error.empty.name=Name can't be empty
 action.new.file.error.empty.name.part=Name can't have empty parts
 
 action.new.script.name=Kotlin Script
 action.new.script.description=Creates new Kotlin script
 action.new.script.dialog.title=New Kotlin Script
-action.new.script.template.name=Kotlin Script
 
 action.new.worksheet.name=Kotlin Worksheet
 action.new.worksheet.description=Creates new Kotlin Worksheet
 action.new.worksheet.dialog.title=New Kotlin Worksheet
-action.new.worksheet.template.name=Kotlin Worksheet
 
 breadcrumbs.tooltip.indexing=Indexing…
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
index f871c920c74..71ac463899a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
@@ -90,27 +90,27 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.file.title"),
                 KotlinFileType.INSTANCE.icon,
-                KotlinBundle.message("action.new.file.dialog.file.description")
+                "Kotlin File"
             )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.class.title"),
                 KotlinIcons.CLASS,
-                KotlinBundle.message("action.new.file.dialog.class.description")
+                "Kotlin Class"
             )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.interface.title"),
                 KotlinIcons.INTERFACE,
-                KotlinBundle.message("action.new.file.dialog.interface.description")
+                "Kotlin Interface"
             )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.enum.title"),
                 KotlinIcons.ENUM,
-                KotlinBundle.message("action.new.file.dialog.enum.description")
+                "Kotlin Enum"
             )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.object.title"),
                 KotlinIcons.OBJECT,
-                KotlinBundle.message("action.new.file.dialog.object.description")
+                "Kotlin Object"
             )
 
         builder.setValidator(NameValidator)
@@ -232,7 +232,7 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
 
         fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? {
             val directorySeparators = when (template.name) {
-                KotlinBundle.message("action.new.file.dialog.file.description") -> FILE_SEPARATORS
+                "Kotlin File" -> FILE_SEPARATORS
                 else -> FQNAME_SEPARATORS
             }
             val (className, targetDir) = findOrCreateTarget(dir, name, directorySeparators)
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
index f45f904bb66..fbd5097216d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
@@ -13,15 +13,17 @@ import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
+import org.jetbrains.annotations.Nls
+import org.jetbrains.annotations.NonNls
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.psi.KtFile
 
 open class NewKotlinScriptAction(
-    val actionName: String,
-    val description: String,
-    val dialogTitle: String,
-    val templateName: String
+    @Nls val actionName: String,
+    @Nls val description: String,
+    @Nls val dialogTitle: String,
+    @NonNls val templateName: String
 ) : CreateFileFromTemplateAction(
     actionName,
     description,
@@ -32,7 +34,7 @@ open class NewKotlinScriptAction(
         actionName = KotlinBundle.message("action.new.script.name"),
         description = KotlinBundle.message("action.new.script.description"),
         dialogTitle = KotlinBundle.message("action.new.script.dialog.title"),
-        templateName = KotlinBundle.message("action.new.script.template.name")
+        templateName = "Kotlin Script"
     )
 
     override fun postProcess(createdElement: PsiFile, templateName: String?, customProperties: Map<String, String>?) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt
index bc2d7549712..965fe4edf47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt
@@ -16,7 +16,7 @@ class NewKotlinWorksheetAction : NewKotlinScriptAction(
     actionName = KotlinBundle.message("action.new.worksheet.name"),
     description = KotlinBundle.message("action.new.worksheet.description"),
     dialogTitle = KotlinBundle.message("action.new.worksheet.dialog.title"),
-    templateName = KotlinBundle.message("action.new.worksheet.template.name")
+    templateName = "Kotlin Worksheet"
 ) {
 
     override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? {