diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
index 72b76ef5c8d..daa1c4f6f56 100644
--- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
+++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
@@ -1,234 +1,141 @@
-#quick fix messages
-add.return.type=Add return type declaration
-add.init.keyword=Add 'init' keyword
-add.init.keyword.family=Add 'init' keyword
-add.init.keyword.in.whole.project=Add 'init' keyword in whole project
-add.init.keyword.in.whole.project.modal.title=Adding 'init' keyword in whole project
-add.init.keyword.in.whole.project.family=Add 'init' keyword in whole project
-insert.delegation.call=Insert ''{0}()'' call
-remove.useless.nullable=Remove useless '?'
-replace.operation.in.binary.expression=Replace operation in a binary expression
-replace.cast.with.static.assert=Replace a cast with a static assert
-introduce.non.null.assertion=Add non-null asserted (!!) call
-remove.unnecessary.non.null.assertion=Remove unnecessary non-null assertion (!!)
-change.to.backing.field=Change reference to backing field
-import.fix=Import
-imports.chooser.title=Imports
-rename.kotlin.package.class.error=Can't rename Kotlin package facade class
-add.semicolon.after.invocation=Add semicolon after invocation of ''{0}''
-add.semicolon.family=Add Semicolon
-change.type=Change type from ''{0}'' to ''{1}''
-change.type.family=Change type
-change.function.signature=Change the signature of function ''{0}''
+fix.insert.delegation.call=Insert ''{0}()'' call
+fix.introduce.non.null.assertion=Add non-null asserted (!!) call
+fix.remove.non.null.assertion=Remove unnecessary non-null assertion (!!)
+fix.import=Import
+fix.change.return.type=Change type
 
-replace.call.error.skipped.defaults=Cannot skip default arguments.
-replace.call.error.undefined.returntype=Unable to determine the return type.
-replace.call.error.duplicate.or.missing.arguments=Duplicate or missing arguments.
-replace.call.error.invalid.arguments=Invalid arguments included.
+action.add.import.chooser.title=Imports
 
-replace.call.error.vararg.not.last=Cannot handle named arguments after a vararg.
-replace.call.error.contains.returns_boolean=Contains must return a Boolean.
+goto.super.chooser.function.title=Choose super function
+goto.super.chooser.property.title=Choose super property
+goto.super.chooser.class.title=Choose super class or interface
 
-add.kotlin.signature.action.family.name=Specify Custom Kotlin Signature
-add.kotlin.signature.action.text=Specify custom Kotlin signature
-edit.kotlin.signature.action.text=Edit custom Kotlin signature
-view.kotlin.signature.action.text=View custom Kotlin signature
+inspection.unused.receiver.parameter=Receiver parameter is never used
+fix.unused.receiver.parameter.remove=Remove redundant receiver parameter
 
-goto.super.function.chooser.title=Choose super function
-goto.super.property.chooser.title=Choose super property
-goto.super.class.chooser.title=Choose super class or interface
+options.color.attribute.descriptor.annotation=Annotation//Annotation name
+options.color.attribute.descriptor.annotation.attribute.name=Annotation//Annotation attribute name
+options.color.attribute.descriptor.builtin.annotation=Keywords//Modifier
+options.color.attribute.descriptor.builtin.keyword.val=Keywords//'val'
+options.color.attribute.descriptor.builtin.keyword.var=Keywords//'var'
+options.color.attribute.descriptor.builtin.keyword=Keywords//Keyword
+options.color.attribute.descriptor.string.escape=String//Escape in string and template braces
+options.color.attribute.descriptor.closure.braces=Braces and Operators//Lambda expression braces and arrow
+options.color.attribute.descriptor.safe.access=Braces and Operators//Safe access dot
+options.color.attribute.descriptor.quest=Braces and Operators//Type nullability marker
+options.color.attribute.descriptor.exclexcl=Braces and Operators//Non-null assertion
+options.color.attribute.descriptor.arrow=Braces and Operators//Arrow
+options.color.attribute.descriptor.colon=Braces and Operators//Colon
+options.color.attribute.descriptor.double.colon=Braces and Operators//Double colon
+options.color.attribute.descriptor.kdoc.comment=Comments//KDoc//KDoc comment
+options.color.attribute.descriptor.kdoc.tag=Comments//KDoc//KDoc tag
+options.color.attribute.descriptor.kdoc.value=Comments//KDoc//Link in KDoc tag
+options.color.attribute.descriptor.object=Classes and Interfaces//Object
+options.color.attribute.descriptor.enumEntry=Classes and Interfaces//Enum entry
+options.color.attribute.descriptor.typeAlias=Classes and Interfaces//Type alias
+options.color.attribute.descriptor.var=Properties and Variables//Var (mutable variable, parameter or property)
+options.color.attribute.descriptor.local.variable=Properties and Variables//Local variable or value
+options.color.attribute.descriptor.captured.variable=Properties and Variables//Variables and values captured in a closure
+options.color.attribute.descriptor.instance.property=Properties and Variables//Instance property
+options.color.attribute.descriptor.instance.property.custom.property.declaration=Properties and Variables//Instance property with custom property declarations
+options.color.attribute.descriptor.package.property=Properties and Variables//Package-level property
+options.color.attribute.descriptor.package.property.custom.property.declaration=Properties and Variables//Package-level property with custom property declarations
+options.color.attribute.descriptor.field=Properties and Variables//Backing field variable
+options.color.attribute.descriptor.extension.property=Properties and Variables//Extension property
+options.color.attribute.descriptor.synthetic.extension.property=Properties and Variables//Synthetic extension property
+options.color.attribute.descriptor.dynamic.property=Properties and Variables//Dynamic property
+options.color.attribute.descriptor.android.extensions.property=Properties and Variables//Android Extensions synthetic properties
+options.color.attribute.descriptor.it=Parameters//Lambda expression default parameter
+options.color.attribute.descriptor.fun=Functions//Function declaration
+options.color.attribute.descriptor.fun.call=Functions//Function call
+options.color.attribute.descriptor.dynamic.fun.call=Functions//Dynamic function call
+options.color.attribute.descriptor.package.fun.call=Functions//Package-level function call
+options.color.attribute.descriptor.suspend.fun.call=Functions//Suspend function call
+options.color.attribute.descriptor.extension.fun.call=Functions//Extension function call
+options.color.attribute.descriptor.constructor.call=Functions//Constructor call
+options.color.attribute.descriptor.variable.as.function.call=Properties and Variables//Variable as function call
+options.color.attribute.descriptor.variable.as.function.like.call=Properties and Variables//Variable as function-like call
+options.color.attribute.descriptor.smart.cast=Smart-casts//Smart-cast value
+options.color.attribute.descriptor.smart.constant=Smart-casts//Smart constant
+options.color.attribute.descriptor.smart.cast.receiver=Smart-casts//Smart-cast implicit receiver
+options.color.attribute.descriptor.label=Label
 
-unused.receiver.parameter=Receiver parameter is never used
-unused.receiver.parameter.remove=Remove redundant receiver parameter
+fix.create.from.usage.family=Create from usage
+fix.create.from.usage.local.variable=Create local variable ''{0}''
 
-livetemplate.description.main=main() function
-livetemplate.description.soutp=Prints function parameter names and values to System.out
-livetemplate.description.iter=Iterate over elements of iterable (for-in loop)
-livetemplate.description.ifn=Inserts ''if null'' expression
-livetemplate.description.inn=Inserts ''if not null'' expression
-livetemplate.description.void=Function returning nothing
-livetemplate.description.fun0=Function with no parameters
-livetemplate.description.fun1=Function with one parameter
-livetemplate.description.fun2=Function with two parameters
-livetemplate.description.interface=Interface
-livetemplate.description.singleton=Singleton
-livetemplate.description.closure=Closure (function without name)
-livetemplate.description.anonymous=Anonymous class
-livetemplate.description.exfun=Extension function
-livetemplate.description.exval=Extension read-only property
-livetemplate.description.exvar=Extension read-write property
+overridden.marker.implementations.multiple=Has implementations
+overridden.marker.implementation=Is implemented in <br/>
+overridden.marker.overrides.multiple=Is overridden in subclasses
+overridden.marker.overrides=Is overridden in <br/>
 
-options.kotlin.attribute.descriptor.annotation=Annotation//Annotation name
-options.kotlin.attribute.descriptor.annotation.attribute.name=Annotation//Annotation attribute name
-options.kotlin.attribute.descriptor.builtin.annotation=Keywords//Modifier
-options.kotlin.attribute.descriptor.builtin.keyword.val=Keywords//'val'
-options.kotlin.attribute.descriptor.builtin.keyword.var=Keywords//'var'
-options.kotlin.attribute.descriptor.builtin.keyword=Keywords//Keyword
-options.kotlin.attribute.descriptor.string.escape=String//Escape in string and template braces
-options.kotlin.attribute.descriptor.closure.braces=Braces and Operators//Lambda expression braces and arrow
-options.kotlin.attribute.descriptor.safe.access=Braces and Operators//Safe access dot
-options.kotlin.attribute.descriptor.quest=Braces and Operators//Type nullability marker
-options.kotlin.attribute.descriptor.exclexcl=Braces and Operators//Non-null assertion
-options.kotlin.attribute.descriptor.arrow=Braces and Operators//Arrow
-options.kotlin.attribute.descriptor.colon=Braces and Operators//Colon
-options.kotlin.attribute.descriptor.double.colon=Braces and Operators//Double colon
-options.kotlin.attribute.descriptor.kdoc.comment=Comments//KDoc//KDoc comment
-options.kotlin.attribute.descriptor.kdoc.tag=Comments//KDoc//KDoc tag
-options.kotlin.attribute.descriptor.kdoc.value=Comments//KDoc//Link in KDoc tag
-options.kotlin.attribute.descriptor.object=Classes and Interfaces//Object
-options.kotlin.attribute.descriptor.enumEntry=Classes and Interfaces//Enum entry
-options.kotlin.attribute.descriptor.typeAlias=Classes and Interfaces//Type alias
-options.kotlin.attribute.descriptor.var=Properties and Variables//Var (mutable variable, parameter or property)
-options.kotlin.attribute.descriptor.local.variable=Properties and Variables//Local variable or value
-options.kotlin.attribute.descriptor.captured.variable=Properties and Variables//Variables and values captured in a closure
-options.kotlin.attribute.descriptor.instance.property=Properties and Variables//Instance property
-options.kotlin.attribute.descriptor.instance.property.custom.property.declaration=Properties and Variables//Instance property with custom property declarations
-options.kotlin.attribute.descriptor.package.property=Properties and Variables//Package-level property
-options.kotlin.attribute.descriptor.package.property.custom.property.declaration=Properties and Variables//Package-level property with custom property declarations
-options.kotlin.attribute.descriptor.field=Properties and Variables//Backing field variable
-options.kotlin.attribute.descriptor.extension.property=Properties and Variables//Extension property
-options.kotlin.attribute.descriptor.synthetic.extension.property=Properties and Variables//Synthetic extension property
-options.kotlin.attribute.descriptor.dynamic.property=Properties and Variables//Dynamic property
-options.kotlin.attribute.descriptor.android.extensions.property=Properties and Variables//Android Extensions synthetic properties
-options.kotlin.attribute.descriptor.it=Parameters//Lambda expression default parameter
-options.kotlin.attribute.descriptor.fun=Functions//Function declaration
-options.kotlin.attribute.descriptor.fun.call=Functions//Function call
-options.kotlin.attribute.descriptor.dynamic.fun.call=Functions//Dynamic function call
-options.kotlin.attribute.descriptor.package.fun.call=Functions//Package-level function call
-options.kotlin.attribute.descriptor.suspend.fun.call=Functions//Suspend function call
-options.kotlin.attribute.descriptor.extension.fun.call=Functions//Extension function call
-options.kotlin.attribute.descriptor.constructor.call=Functions//Constructor call
-options.kotlin.attribute.descriptor.variable.as.function.call=Properties and Variables//Variable as function call
-options.kotlin.attribute.descriptor.variable.as.function.like.call=Properties and Variables//Variable as function-like call
-options.kotlin.attribute.descriptor.smart.cast=Smart-casts//Smart-cast value
-options.kotlin.attribute.descriptor.smart.constant=Smart-casts//Smart constant
-options.kotlin.attribute.descriptor.smart.cast.receiver=Smart-casts//Smart-cast implicit receiver
-options.kotlin.attribute.descriptor.label=Label
-
-migrate.sure=Replace sure() calls by !! in project
-migrate.class.object.to.companion=Replace 'class' keyword with 'companion' modifier
-migrate.class.object.to.companion.family=Replace 'class' Keyword with 'companion' Modifier
-migrate.class.object.to.companion.in.whole.project=Replace 'class' keyword with 'companion' modifier in whole project
-migrate.class.object.to.companion.in.whole.project.modal.title=Replacing 'class' keyword with 'companion' modifier in whole project
-migrate.class.object.to.companion.in.whole.project.family=Replace 'class' Keyword with 'companion' Modifier in Whole Project
-migrate.lambda.syntax=Migrate lambda syntax
-migrate.lambda.syntax.family=Migrate lambda syntax
-change.to.property.name.family.name=Change to property name
-change.to.property.name.action=Change ''{0}'' to ''{1}''
-create.from.usage.family=Create from usage
-create.local.variable.from.usage=Create local variable ''{0}''
-create.parameter.from.usage=Create parameter ''{0}''
-surround.with.string.template="${expr}"
-surround.with.when.template=when (expr) {}
-surround.with.function.template={ }
-kotlin.code.transformations=Kotlin Code Transformations
-fold.if.to.call=Replace 'if' expression with method call
-fold.if.to.call.family=Replace 'if' Expression with Method Call
-fold.when.to.call=Replace 'when' expression with method call
-fold.when.to.call.family=Replace 'when' Expression with Method Call
-unfold.call.to.if=Replace method call with 'if' expression
-unfold.call.to.if.family=Replace Method Call with 'if' Expression
-unfold.call.to.when=Replace method call with 'when' expression
-unfold.call.to.when.family=Replace Method Call with 'when' Expression
-transform.if.statement.with.assignments.to.expression=Transform 'if' statement with assignments to expression
-transform.assignment.with.if.expression.to.statement=Transform assignment with 'if' expression to statement
-transform.if.statement.with.assignments.to.expression.family=Transform 'if' Statement with Assignments to Expression
-transform.assignment.with.if.expression.to.statement.family=Transform Assignment with 'if' Expression to Statement
-
-replace.java.class.argument=Replace javaClass<T>() with T::class
-replace.java.class.argument.family=Replace javaClass<T>() with T::class
-
-replace.java.class.parameter=Replace Class<T> with KClass<T> in whole annotation
-replace.java.class.parameter.family=Replace Class<T> with KClass<T> in whole annotation
-
-property.is.implemented.too.many=Has implementations
-property.is.overridden.too.many=Is overridden in subclasses
-property.is.implemented.header=Is implemented in <br/>
-property.is.overridden.header=Is overridden in <br/>
-
-navigation.title.overriding.property=Choose Implementation of {0}
-navigation.findUsages.title.overriding.property=Overriding properties of {0}
-navigation.title.super.declaration=Choose Super Implementation of {0}
-navigation.findUsages.title.super.declaration=Super Implementations of {0}
+overridden.marker.implementations.choose.implementation.title=Choose Implementation of {0}
+overridden.marker.implementations.choose.implementation.find.usages=Overriding properties of {0}
+overridden.marker.overrides.choose.implementation.title=Choose Super Implementation of {0}
+overridden.marker.overrides.choose.implementation.find.usages=Super Implementations of {0}
 
 remove.expression = Remove ''{0}''
 unwrap.expression = Unwrap ''{0}''
 remove.else = Remove else in ''{0}''
 unwrap.else = Unwrap else in ''{0}''
 
-usageType.annotation.type = Annotation
-usageType.import = Import directive
-usageType.callable.reference = Callable reference
-usageType.type.constraint = Type constraint
-usageType.type.argument = Type argument
-usageType.value.parameter.type = Parameter type
-usageType.nonLocal.property.type = Class/object property type
-usageType.local.variable.type = Local variable type
-usageType.function.return.type = Function return types
-usageType.superType = Supertype
-usageType.is = Target type of 'is' operation
-usageType.as = Target type of 'as' operation
-usageType.class.object = Nested class/object
-usageType.companion.object = Companion object
-usageType.instantiation = Instantiation
-usageType.function.call = Function call
-usageType.implicit.get = Implicit 'get'
-usageType.implicit.set = Implicit 'set'
-usageType.implicit.invoke = Implicit 'invoke'
-usageType.implicit.iteration = Implicit iteration
-usageType.property.delegation = Property delegation
-usageType.extension.receiver.type = Extension receiver type
-usageType.super.type.qualifier = Super type qualifier
-usageType.receiver = Receiver
-usageType.selector = Selector
-usageType.delegate = Delegate
-usageType.packageDirective = Package directive
-usageType.packageMemberAccess = Package member access
+find.usages.type.callable.reference = Callable reference
+find.usages.type.type.constraint = Type constraint
+find.usages.type.value.parameter.type = Parameter type
+find.usages.type.nonLocal.property.type = Class/object property type
+find.usages.type.function.return.type = Function return types
+find.usages.type.superType = Supertype
+find.usages.type.is = Target type of 'is' operation
+find.usages.type.class.object = Nested class/object
+find.usages.type.companion.object = Companion object
+find.usages.type.function.call = Function call
+find.usages.type.implicit.get = Implicit 'get'
+find.usages.type.implicit.set = Implicit 'set'
+find.usages.type.implicit.invoke = Implicit 'invoke'
+find.usages.type.implicit.iteration = Implicit iteration
+find.usages.type.property.delegation = Property delegation
+find.usages.type.extension.receiver.type = Extension receiver type
+find.usages.type.super.type.qualifier = Super type qualifier
+find.usages.type.receiver = Receiver
+find.usages.type.delegate = Delegate
+find.usages.type.packageDirective = Package directive
+find.usages.type.packageMemberAccess = Package member access
 
-x.in.y={0} in {1}
-x.implements.y={0} in {1} implements {2} in {3}.
-x.overrides.y.in.class.list={0} overrides declarations in the following classes/interfaces: {1} Do you want to {2} the base declarations?
+override.declaration.x.in.y={0} in {1}
+override.declaration.x.implements.y={0} in {1} implements {2} in {3}.
+override.declaration.x.overrides.y.in.class.list={0} overrides declarations in the following classes/interfaces: {1} Do you want to {2} the base declarations?
 
-unused.overriding.methods.title=Unused Overriding Members
-there.are.unused.methods.that.override.methods.you.delete=There are unused members that override methods you delete.
-choose.the.ones.you.want.to.be.deleted=Choose the ones you want to be deleted.
-method.column=Member
-delete.param.in.method.hierarchy={0} is a part of method hierarchy. Do you want to delete multiple parameters?
+override.declaration.unused.overriding.methods.title=Unused Overriding Members
+override.declaration.unused.overriding.methods.description=There are unused members that override methods you delete.
+override.declaration.choose.to.delete=Choose the ones you want to be deleted.
+override.declaration.member=Member
+override.declaration.delete.multiple.parameters={0} is a part of method hierarchy. Do you want to delete multiple parameters?
 
-find.what.implementing.methods.checkbox=&Implementing functions
-find.what.overriding.methods.checkbox=Over&riding functions
-find.what.implementing.properties.checkbox=&Implementing properties
-find.what.overriding.properties.checkbox=Over&riding properties
-find.what.property.readers.checkbox=Readers
-find.what.property.writers.checkbox=Writers
-find.options.include.overloaded.methods.checkbox=Include o&verloaded functions and extensions
-find.what.functions.usages.checkbox=Usages of &functions
-find.what.properties.usages.checkbox=Usages of &properties
-find.what.constructor.usages.checkbox=Usages of &constructor
-find.what.derived.classes.checkbox=&Derived classes
-find.what.derived.interfaces.checkbox=Derived &interfaces
+find.declaration.implementing.methods.checkbox=&Implementing functions
+find.declaration.overriding.methods.checkbox=Over&riding functions
+find.declaration.implementing.properties.checkbox=&Implementing properties
+find.declaration.overriding.properties.checkbox=Over&riding properties
+find.declaration.property.readers.checkbox=Readers
+find.declaration.property.writers.checkbox=Writers
+find.declaration.include.overloaded.methods.checkbox=Include o&verloaded functions and extensions
+find.declaration.functions.usages.checkbox=Usages of &functions
+find.declaration.properties.usages.checkbox=Usages of &properties
+find.declaration.constructor.usages.checkbox=Usages of &constructor
+find.declaration.derived.classes.checkbox=&Derived classes
+find.declaration.derived.interfaces.checkbox=Derived &interfaces
 
 hierarchy.legend.member.is.defined.in.class=Member is defined in the class
 hierarchy.legend.member.defined.in.superclass=Member is not defined in the class but defined in superclass
 hierarchy.legend.member.should.be.defined=Member should be defined since the class is not abstract
 
-suppress.warnings.family=Suppress Warnings
-suppress.warning.for=Suppress ''{0}'' for {1} {2}
+intention.suppress.family=Suppress Warnings
+intention.suppress.text=Suppress ''{0}'' for {1} {2}
 
-reflection.not.found=Reflection not found in the classpath
-
-# Kotlin Compiler Settings Tab
-
-#Common
 kotlin.compiler.option.generate.no.warnings=Report compiler &warnings
 kotlin.compiler.option.additional.command.line.parameters=&Additional command line parameters:
-kotlin.compiler.option.additional.command.line.parameters.dialog.title=Additional command line parameters
 kotlin.compiler.option.enable.new.inference.in.ide=Enable new type inference algorithm for IDE analysis
 
-# Kotlin to JVM
 kotlin.compiler.jvm.option.panel.title=Kotlin to JVM
 
-# Kotlin to JavaScript
 kotlin.compiler.js.option.panel.title=Kotlin to JavaScript
 kotlin.compiler.js.option.generate.sourcemaps=Generate &source maps
 kotlin.compiler.js.option.output.prefix=File to &prepend to generated code:
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
index 4c9ebe424f2..36afaa7bed2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
@@ -50,8 +50,8 @@ class KotlinSuppressIntentionAction private constructor(
         kind: AnnotationHostKind
     ) : this(suppressAt as PsiElement, suppressKey, kind)
 
-    override fun getFamilyName() = KotlinBundle.message("suppress.warnings.family")
-    override fun getText() = KotlinBundle.message("suppress.warning.for", suppressKey, kind.kind, kind.name)
+    override fun getFamilyName() = KotlinBundle.message("intention.suppress.family")
+    override fun getText() = KotlinBundle.message("intention.suppress.text", suppressKey, kind.kind, kind.name)
 
     override fun isAvailable(project: Project, editor: Editor?, element: PsiElement) = element.isValid
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
index 12ab1f2787c..87bfb9efe6f 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
@@ -41,7 +41,7 @@ open class ImplementMembersHandler : OverrideImplementMembersHandler(), Intentio
 
     override fun getNoMembersFoundHint() = KotlinIdeaCoreBundle.message("hint.text.no.members.to.implement.have.been.found")
 
-    override fun getText() = KotlinIdeaCoreBundle.message("action.text.implement.members")
+    override fun getText() = familyName
     override fun getFamilyName() = KotlinIdeaCoreBundle.message("action.text.implement.members")
 
     override fun isAvailable(project: Project, editor: Editor, file: PsiFile) = isValidFor(editor, file)
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java
index 100035d4f0a..ff19f891ae4 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/surroundWith/KotlinSurrounderUtils.java
@@ -19,8 +19,8 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt;
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
 
 public class KotlinSurrounderUtils {
-    public static String SURROUND_WITH = KotlinIdeaCoreBundle.message("hint.text.surround.with");
-    public static String SURROUND_WITH_ERROR = KotlinIdeaCoreBundle.message("hint.text.surround.with.cannot.perform.action");
+    public static String SURROUND_WITH = KotlinIdeaCoreBundle.message("surround.with.title");
+    public static String SURROUND_WITH_ERROR = KotlinIdeaCoreBundle.message("surround.with.error.cannot.perform.action");
 
     private KotlinSurrounderUtils() {
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
index e0066dd50f9..ede59572fba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
@@ -186,7 +186,7 @@ class KotlinAddImportAction internal constructor(
     }
 
     private fun getVariantSelectionPopup(): BaseListPopupStep<AutoImportVariant> {
-        return object : BaseListPopupStep<AutoImportVariant>(KotlinBundle.message("imports.chooser.title"), variants) {
+        return object : BaseListPopupStep<AutoImportVariant>(KotlinBundle.message("action.add.import.chooser.title"), variants) {
             override fun isAutoSelectionEnabled() = false
 
             override fun isSpeedSearchEnabled() = true
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.kt
index 1c1520b3987..c017897cc1b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.kt
@@ -104,9 +104,9 @@ class GotoSuperActionHandler : CodeInsightActionHandler {
 
     private fun getTitle(descriptor: DeclarationDescriptor): String? =
         when (descriptor) {
-            is ClassDescriptor -> KotlinBundle.message("goto.super.class.chooser.title")
-            is PropertyDescriptor -> KotlinBundle.message("goto.super.property.chooser.title")
-            is SimpleFunctionDescriptor -> KotlinBundle.message("goto.super.function.chooser.title")
+            is ClassDescriptor -> KotlinBundle.message("goto.super.chooser.class.title")
+            is PropertyDescriptor -> KotlinBundle.message("goto.super.chooser.property.title")
+            is SimpleFunctionDescriptor -> KotlinBundle.message("goto.super.chooser.function.title")
             else -> null
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
index b1b380aa57f..f2d77a94966 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
@@ -22,14 +22,13 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.surroundWith.KotlinExpressionSurrounder;
 import org.jetbrains.kotlin.psi.*;
 
 public class KotlinStringTemplateSurrounder extends KotlinExpressionSurrounder {
     @Override
     public String getTemplateDescription() {
-        return KotlinBundle.message("surround.with.string.template");
+        return "\"${expr}\"";
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
index a2432a0dcc1..b19f9b64f4b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassKind;
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;
-import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.surroundWith.KotlinExpressionSurrounder;
 import org.jetbrains.kotlin.psi.*;
@@ -35,7 +34,7 @@ import org.jetbrains.kotlin.types.KotlinType;
 public class KotlinWhenSurrounder extends KotlinExpressionSurrounder {
     @Override
     public String getTemplateDescription() {
-        return KotlinBundle.message("surround.with.when.template");
+        return "when (expr) {}";
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
index 6a35cbc9fd9..4c04a74865c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
@@ -62,6 +62,6 @@ public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder
 
     @Override
     public String getTemplateDescription() {
-        return KotlinBundle.message("surround.with.function.template");
+        return "{ }";
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
index 030d3343e7d..68a71987851 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
@@ -75,35 +75,35 @@ object KotlinUsageTypeProvider : UsageTypeProviderEx {
 
 object KotlinUsageTypes {
     // types
-    val TYPE_CONSTRAINT = UsageType(KotlinBundle.message("usageType.type.constraint"))
-    val VALUE_PARAMETER_TYPE = UsageType(KotlinBundle.message("usageType.value.parameter.type"))
-    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinBundle.message("usageType.nonLocal.property.type"))
-    val FUNCTION_RETURN_TYPE = UsageType(KotlinBundle.message("usageType.function.return.type"))
-    val SUPER_TYPE = UsageType(KotlinBundle.message("usageType.superType"))
-    val IS = UsageType(KotlinBundle.message("usageType.is"))
-    val CLASS_OBJECT_ACCESS = UsageType(KotlinBundle.message("usageType.class.object"))
-    val COMPANION_OBJECT_ACCESS = UsageType(KotlinBundle.message("usageType.companion.object"))
-    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinBundle.message("usageType.extension.receiver.type"))
-    val SUPER_TYPE_QUALIFIER = UsageType(KotlinBundle.message("usageType.super.type.qualifier"))
+    val TYPE_CONSTRAINT = UsageType(KotlinBundle.message("find.usages.type.type.constraint"))
+    val VALUE_PARAMETER_TYPE = UsageType(KotlinBundle.message("find.usages.type.value.parameter.type"))
+    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinBundle.message("find.usages.type.nonLocal.property.type"))
+    val FUNCTION_RETURN_TYPE = UsageType(KotlinBundle.message("find.usages.type.function.return.type"))
+    val SUPER_TYPE = UsageType(KotlinBundle.message("find.usages.type.superType"))
+    val IS = UsageType(KotlinBundle.message("find.usages.type.is"))
+    val CLASS_OBJECT_ACCESS = UsageType(KotlinBundle.message("find.usages.type.class.object"))
+    val COMPANION_OBJECT_ACCESS = UsageType(KotlinBundle.message("find.usages.type.companion.object"))
+    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinBundle.message("find.usages.type.extension.receiver.type"))
+    val SUPER_TYPE_QUALIFIER = UsageType(KotlinBundle.message("find.usages.type.super.type.qualifier"))
     val TYPE_ALIAS = UsageType("Type alias")
 
     // functions
-    val FUNCTION_CALL = UsageType(KotlinBundle.message("usageType.function.call"))
-    val IMPLICIT_GET = UsageType(KotlinBundle.message("usageType.implicit.get"))
-    val IMPLICIT_SET = UsageType(KotlinBundle.message("usageType.implicit.set"))
-    val IMPLICIT_INVOKE = UsageType(KotlinBundle.message("usageType.implicit.invoke"))
-    val IMPLICIT_ITERATION = UsageType(KotlinBundle.message("usageType.implicit.iteration"))
-    val PROPERTY_DELEGATION = UsageType(KotlinBundle.message("usageType.property.delegation"))
+    val FUNCTION_CALL = UsageType(KotlinBundle.message("find.usages.type.function.call"))
+    val IMPLICIT_GET = UsageType(KotlinBundle.message("find.usages.type.implicit.get"))
+    val IMPLICIT_SET = UsageType(KotlinBundle.message("find.usages.type.implicit.set"))
+    val IMPLICIT_INVOKE = UsageType(KotlinBundle.message("find.usages.type.implicit.invoke"))
+    val IMPLICIT_ITERATION = UsageType(KotlinBundle.message("find.usages.type.implicit.iteration"))
+    val PROPERTY_DELEGATION = UsageType(KotlinBundle.message("find.usages.type.property.delegation"))
 
     // values
-    val RECEIVER = UsageType(KotlinBundle.message("usageType.receiver"))
-    val DELEGATE = UsageType(KotlinBundle.message("usageType.delegate"))
+    val RECEIVER = UsageType(KotlinBundle.message("find.usages.type.receiver"))
+    val DELEGATE = UsageType(KotlinBundle.message("find.usages.type.delegate"))
 
     // packages
-    val PACKAGE_DIRECTIVE = UsageType(KotlinBundle.message("usageType.packageDirective"))
-    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinBundle.message("usageType.packageMemberAccess"))
+    val PACKAGE_DIRECTIVE = UsageType(KotlinBundle.message("find.usages.type.packageDirective"))
+    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinBundle.message("find.usages.type.packageMemberAccess"))
 
     // common usage types
-    val CALLABLE_REFERENCE = UsageType(KotlinBundle.message("usageType.callable.reference"))
+    val CALLABLE_REFERENCE = UsageType(KotlinBundle.message("find.usages.type.callable.reference"))
     val NAMED_ARGUMENT = UsageType("Named argument")
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
index c0c856a7cfd..9071e021ba7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
@@ -109,31 +109,31 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog {
         Utils.renameCheckbox(
                 findWhatPanel,
                 FindBundle.message("find.what.methods.usages.checkbox"),
-                KotlinBundle.message("find.what.functions.usages.checkbox")
+                KotlinBundle.message("find.declaration.functions.usages.checkbox")
         );
         Utils.renameCheckbox(
                 findWhatPanel,
                 FindBundle.message("find.what.fields.usages.checkbox"),
-                KotlinBundle.message("find.what.properties.usages.checkbox")
+                KotlinBundle.message("find.declaration.properties.usages.checkbox")
         );
         Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.implementing.classes.checkbox"));
-        Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.derived.interfaces.checkbox"));
-        Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.derived.classes.checkbox"));
+        Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.declaration.derived.interfaces.checkbox"));
+        Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.declaration.derived.classes.checkbox"));
 
         derivedClasses = addCheckboxToPanel(
-                KotlinBundle.message("find.what.derived.classes.checkbox"),
+                KotlinBundle.message("find.declaration.derived.classes.checkbox"),
                 getFindUsagesOptions().isDerivedClasses,
                 findWhatPanel,
                 true
         );
         derivedTraits = addCheckboxToPanel(
-                KotlinBundle.message("find.what.derived.interfaces.checkbox"),
+                KotlinBundle.message("find.declaration.derived.interfaces.checkbox"),
                 getFindUsagesOptions().isDerivedInterfaces,
                 findWhatPanel,
                 true
         );
         constructorUsages = addCheckboxToPanel(
-                KotlinBundle.message("find.what.constructor.usages.checkbox"),
+                KotlinBundle.message("find.declaration.constructor.usages.checkbox"),
                 getFindUsagesOptions().getSearchConstructorUsages(),
                 findWhatPanel,
                 true
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
index 67403da1d01..65ddc33faf9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
@@ -71,13 +71,13 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog {
         if (findWhatPanel != null) {
             Utils.renameCheckbox(
                     findWhatPanel,
-                    FindBundle.message("find.what.implementing.methods.checkbox"),
-                    KotlinBundle.message("find.what.implementing.methods.checkbox")
+                    FindBundle.message("find.declaration.implementing.methods.checkbox"),
+                    KotlinBundle.message("find.declaration.implementing.methods.checkbox")
             );
             Utils.renameCheckbox(
                     findWhatPanel,
-                    FindBundle.message("find.what.overriding.methods.checkbox"),
-                    KotlinBundle.message("find.what.overriding.methods.checkbox")
+                    FindBundle.message("find.declaration.overriding.methods.checkbox"),
+                    KotlinBundle.message("find.declaration.overriding.methods.checkbox")
             );
         }
 
@@ -90,11 +90,11 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog {
 
         if (!Utils.renameCheckbox(
                 optionsPanel,
-                FindBundle.message("find.options.include.overloaded.methods.checkbox"),
-                KotlinBundle.message("find.options.include.overloaded.methods.checkbox")
+                FindBundle.message("find.declaration.include.overloaded.methods.checkbox"),
+                KotlinBundle.message("find.declaration.include.overloaded.methods.checkbox")
         )) {
             addCheckboxToPanel(
-                    KotlinBundle.message("find.options.include.overloaded.methods.checkbox"),
+                    KotlinBundle.message("find.declaration.include.overloaded.methods.checkbox"),
                     FindSettings.getInstance().isSearchOverloadedMethods(),
                     optionsPanel,
                     false
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
index 6da08536bcc..35bb5964a12 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
@@ -85,13 +85,13 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
         KotlinPropertyFindUsagesOptions options = getFindUsagesOptions();
 
         readAccesses = addCheckboxToPanel(
-                KotlinBundle.message("find.what.property.readers.checkbox"),
+                KotlinBundle.message("find.declaration.property.readers.checkbox"),
                 options.isReadAccess,
                 findWhatPanel,
                 true
         );
         writeAccesses = addCheckboxToPanel(
-                KotlinBundle.message("find.what.property.writers.checkbox"),
+                KotlinBundle.message("find.declaration.property.writers.checkbox"),
                 options.isWriteAccess,
                 findWhatPanel,
                 true
@@ -116,8 +116,8 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
         if (isOpen || isAbstract) {
             overrideUsages = addCheckboxToPanel(
                     isAbstract
-                    ? KotlinBundle.message("find.what.implementing.properties.checkbox")
-                    : KotlinBundle.message("find.what.overriding.properties.checkbox"),
+                    ? KotlinBundle.message("find.declaration.implementing.properties.checkbox")
+                    : KotlinBundle.message("find.declaration.overriding.properties.checkbox"),
                     FindSettings.getInstance().isSearchOverloadedMethods(),
                     optionsPanel,
                     false
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
index ea6f9f6b2e7..5bb97281fac 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
@@ -130,69 +130,69 @@ var <PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION><MUTABLE_VARIABLE>globalCounte
         infix fun String.to(key: TextAttributesKey) = AttributesDescriptor(this, key)
 
         return arrayOf(
-            KotlinBundle.message("options.kotlin.attribute.descriptor.builtin.keyword") to KotlinHighlightingColors.KEYWORD,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.builtin.keyword.val") to KotlinHighlightingColors.VAL_KEYWORD,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.builtin.keyword.var") to KotlinHighlightingColors.VAR_KEYWORD,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.builtin.annotation") to KotlinHighlightingColors.BUILTIN_ANNOTATION,
+            KotlinBundle.message("options.color.attribute.descriptor.builtin.keyword") to KotlinHighlightingColors.KEYWORD,
+            KotlinBundle.message("options.color.attribute.descriptor.builtin.keyword.val") to KotlinHighlightingColors.VAL_KEYWORD,
+            KotlinBundle.message("options.color.attribute.descriptor.builtin.keyword.var") to KotlinHighlightingColors.VAR_KEYWORD,
+            KotlinBundle.message("options.color.attribute.descriptor.builtin.annotation") to KotlinHighlightingColors.BUILTIN_ANNOTATION,
             OptionsBundle.message("options.java.attribute.descriptor.number") to KotlinHighlightingColors.NUMBER,
             OptionsBundle.message("options.java.attribute.descriptor.string") to KotlinHighlightingColors.STRING,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.string.escape") to KotlinHighlightingColors.STRING_ESCAPE,
+            KotlinBundle.message("options.color.attribute.descriptor.string.escape") to KotlinHighlightingColors.STRING_ESCAPE,
             OptionsBundle.message("options.java.attribute.descriptor.invalid.escape.in.string") to KotlinHighlightingColors.INVALID_STRING_ESCAPE,
             OptionsBundle.message("options.java.attribute.descriptor.operator.sign") to KotlinHighlightingColors.OPERATOR_SIGN,
             OptionsBundle.message("options.java.attribute.descriptor.parentheses") to KotlinHighlightingColors.PARENTHESIS,
             OptionsBundle.message("options.java.attribute.descriptor.braces") to KotlinHighlightingColors.BRACES,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.closure.braces") to KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.arrow") to KotlinHighlightingColors.ARROW,
+            KotlinBundle.message("options.color.attribute.descriptor.closure.braces") to KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW,
+            KotlinBundle.message("options.color.attribute.descriptor.arrow") to KotlinHighlightingColors.ARROW,
             OptionsBundle.message("options.java.attribute.descriptor.brackets") to KotlinHighlightingColors.BRACKETS,
             OptionsBundle.message("options.java.attribute.descriptor.comma") to KotlinHighlightingColors.COMMA,
             OptionsBundle.message("options.java.attribute.descriptor.semicolon") to KotlinHighlightingColors.SEMICOLON,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.colon") to KotlinHighlightingColors.COLON,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.double.colon") to KotlinHighlightingColors.DOUBLE_COLON,
+            KotlinBundle.message("options.color.attribute.descriptor.colon") to KotlinHighlightingColors.COLON,
+            KotlinBundle.message("options.color.attribute.descriptor.double.colon") to KotlinHighlightingColors.DOUBLE_COLON,
             OptionsBundle.message("options.java.attribute.descriptor.dot") to KotlinHighlightingColors.DOT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.safe.access") to KotlinHighlightingColors.SAFE_ACCESS,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.quest") to KotlinHighlightingColors.QUEST,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.exclexcl") to KotlinHighlightingColors.EXCLEXCL,
+            KotlinBundle.message("options.color.attribute.descriptor.safe.access") to KotlinHighlightingColors.SAFE_ACCESS,
+            KotlinBundle.message("options.color.attribute.descriptor.quest") to KotlinHighlightingColors.QUEST,
+            KotlinBundle.message("options.color.attribute.descriptor.exclexcl") to KotlinHighlightingColors.EXCLEXCL,
             OptionsBundle.message("options.java.attribute.descriptor.line.comment") to KotlinHighlightingColors.LINE_COMMENT,
             OptionsBundle.message("options.java.attribute.descriptor.block.comment") to KotlinHighlightingColors.BLOCK_COMMENT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.comment") to KotlinHighlightingColors.DOC_COMMENT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.tag") to KotlinHighlightingColors.KDOC_TAG,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.value") to KotlinHighlightingColors.KDOC_LINK,
+            KotlinBundle.message("options.color.attribute.descriptor.kdoc.comment") to KotlinHighlightingColors.DOC_COMMENT,
+            KotlinBundle.message("options.color.attribute.descriptor.kdoc.tag") to KotlinHighlightingColors.KDOC_TAG,
+            KotlinBundle.message("options.color.attribute.descriptor.kdoc.value") to KotlinHighlightingColors.KDOC_LINK,
             OptionsBundle.message("options.java.attribute.descriptor.class") to KotlinHighlightingColors.CLASS,
             OptionsBundle.message("options.java.attribute.descriptor.type.parameter") to KotlinHighlightingColors.TYPE_PARAMETER,
             OptionsBundle.message("options.java.attribute.descriptor.abstract.class") to KotlinHighlightingColors.ABSTRACT_CLASS,
             OptionsBundle.message("options.java.attribute.descriptor.interface") to KotlinHighlightingColors.TRAIT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.annotation") to KotlinHighlightingColors.ANNOTATION,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.annotation.attribute.name") to KotlinHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.object") to KotlinHighlightingColors.OBJECT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.enumEntry") to KotlinHighlightingColors.ENUM_ENTRY,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.typeAlias") to KotlinHighlightingColors.TYPE_ALIAS,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.var") to KotlinHighlightingColors.MUTABLE_VARIABLE,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.local.variable") to KotlinHighlightingColors.LOCAL_VARIABLE,
+            KotlinBundle.message("options.color.attribute.descriptor.annotation") to KotlinHighlightingColors.ANNOTATION,
+            KotlinBundle.message("options.color.attribute.descriptor.annotation.attribute.name") to KotlinHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES,
+            KotlinBundle.message("options.color.attribute.descriptor.object") to KotlinHighlightingColors.OBJECT,
+            KotlinBundle.message("options.color.attribute.descriptor.enumEntry") to KotlinHighlightingColors.ENUM_ENTRY,
+            KotlinBundle.message("options.color.attribute.descriptor.typeAlias") to KotlinHighlightingColors.TYPE_ALIAS,
+            KotlinBundle.message("options.color.attribute.descriptor.var") to KotlinHighlightingColors.MUTABLE_VARIABLE,
+            KotlinBundle.message("options.color.attribute.descriptor.local.variable") to KotlinHighlightingColors.LOCAL_VARIABLE,
             OptionsBundle.message("options.java.attribute.descriptor.parameter") to KotlinHighlightingColors.PARAMETER,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.captured.variable") to KotlinHighlightingColors.WRAPPED_INTO_REF,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.instance.property") to KotlinHighlightingColors.INSTANCE_PROPERTY,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.instance.property.custom.property.declaration") to KotlinHighlightingColors.INSTANCE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.package.property.custom.property.declaration") to KotlinHighlightingColors.PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.package.property") to KotlinHighlightingColors.PACKAGE_PROPERTY,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.field") to KotlinHighlightingColors.BACKING_FIELD_VARIABLE,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.extension.property") to KotlinHighlightingColors.EXTENSION_PROPERTY,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.synthetic.extension.property") to KotlinHighlightingColors.SYNTHETIC_EXTENSION_PROPERTY,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.dynamic.property") to KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.android.extensions.property") to KotlinHighlightingColors.ANDROID_EXTENSIONS_PROPERTY_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.it") to KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.fun") to KotlinHighlightingColors.FUNCTION_DECLARATION,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.fun.call") to KotlinHighlightingColors.FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.dynamic.fun.call") to KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.suspend.fun.call") to KotlinHighlightingColors.SUSPEND_FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.package.fun.call") to KotlinHighlightingColors.PACKAGE_FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.extension.fun.call") to KotlinHighlightingColors.EXTENSION_FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.constructor.call") to KotlinHighlightingColors.CONSTRUCTOR_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.variable.as.function.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.variable.as.function.like.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.smart.cast") to KotlinHighlightingColors.SMART_CAST_VALUE,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.smart.constant") to KotlinHighlightingColors.SMART_CONSTANT,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.smart.cast.receiver") to KotlinHighlightingColors.SMART_CAST_RECEIVER,
-            KotlinBundle.message("options.kotlin.attribute.descriptor.label") to KotlinHighlightingColors.LABEL,
+            KotlinBundle.message("options.color.attribute.descriptor.captured.variable") to KotlinHighlightingColors.WRAPPED_INTO_REF,
+            KotlinBundle.message("options.color.attribute.descriptor.instance.property") to KotlinHighlightingColors.INSTANCE_PROPERTY,
+            KotlinBundle.message("options.color.attribute.descriptor.instance.property.custom.property.declaration") to KotlinHighlightingColors.INSTANCE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
+            KotlinBundle.message("options.color.attribute.descriptor.package.property.custom.property.declaration") to KotlinHighlightingColors.PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
+            KotlinBundle.message("options.color.attribute.descriptor.package.property") to KotlinHighlightingColors.PACKAGE_PROPERTY,
+            KotlinBundle.message("options.color.attribute.descriptor.field") to KotlinHighlightingColors.BACKING_FIELD_VARIABLE,
+            KotlinBundle.message("options.color.attribute.descriptor.extension.property") to KotlinHighlightingColors.EXTENSION_PROPERTY,
+            KotlinBundle.message("options.color.attribute.descriptor.synthetic.extension.property") to KotlinHighlightingColors.SYNTHETIC_EXTENSION_PROPERTY,
+            KotlinBundle.message("options.color.attribute.descriptor.dynamic.property") to KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.android.extensions.property") to KotlinHighlightingColors.ANDROID_EXTENSIONS_PROPERTY_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.it") to KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
+            KotlinBundle.message("options.color.attribute.descriptor.fun") to KotlinHighlightingColors.FUNCTION_DECLARATION,
+            KotlinBundle.message("options.color.attribute.descriptor.fun.call") to KotlinHighlightingColors.FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.dynamic.fun.call") to KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.suspend.fun.call") to KotlinHighlightingColors.SUSPEND_FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.package.fun.call") to KotlinHighlightingColors.PACKAGE_FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.extension.fun.call") to KotlinHighlightingColors.EXTENSION_FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.constructor.call") to KotlinHighlightingColors.CONSTRUCTOR_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.variable.as.function.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.variable.as.function.like.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
+            KotlinBundle.message("options.color.attribute.descriptor.smart.cast") to KotlinHighlightingColors.SMART_CAST_VALUE,
+            KotlinBundle.message("options.color.attribute.descriptor.smart.constant") to KotlinHighlightingColors.SMART_CONSTANT,
+            KotlinBundle.message("options.color.attribute.descriptor.smart.cast.receiver") to KotlinHighlightingColors.SMART_CAST_RECEIVER,
+            KotlinBundle.message("options.color.attribute.descriptor.label") to KotlinHighlightingColors.LABEL,
             "Named argument" to KotlinHighlightingColors.NAMED_ARGUMENT
         ) +
                 DslHighlighterExtension.descriptionsToStyles.map { (description, key) -> description to key }.toTypedArray()
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
index c825f0531f3..b265bdc4de9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
@@ -58,18 +58,18 @@ fun getOverriddenPropertyTooltip(property: KtNamedDeclaration): String? {
     val isImplemented = isImplemented(property)
     if (overriddenInClassesProcessor.isOverflow) {
         return if (isImplemented)
-            KotlinBundle.message("property.is.implemented.too.many")
+            KotlinBundle.message("overridden.marker.implementations.multiple")
         else
-            KotlinBundle.message("property.is.overridden.too.many")
+            KotlinBundle.message("overridden.marker.overrides.multiple")
     }
 
     val collectedClasses = overriddenInClassesProcessor.collection
     if (collectedClasses.isEmpty()) return null
 
     val start = if (isImplemented)
-        KotlinBundle.message("property.is.implemented.header")
+        KotlinBundle.message("overridden.marker.implementation")
     else
-        KotlinBundle.message("property.is.overridden.header")
+        KotlinBundle.message("overridden.marker.overrides")
 
     val pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{0}"
     return GutterIconTooltipHelper.composeText(collectedClasses.sortedWith(PsiClassListCellRenderer().comparator), start, pattern)
@@ -112,8 +112,8 @@ fun buildNavigateToPropertyOverriddenDeclarationsPopup(e: MouseEvent?, element:
 
     return NavigationPopupDescriptor(
         navigatingOverrides,
-        KotlinBundle.message("navigation.title.overriding.property", propertyOrParameter.name),
-        KotlinBundle.message("navigation.findUsages.title.overriding.property", propertyOrParameter.name), renderer
+        KotlinBundle.message("overridden.marker.implementations.choose.implementation.title", propertyOrParameter.name),
+        KotlinBundle.message("overridden.marker.implementations.choose.implementation.find.usages", propertyOrParameter.name), renderer
     )
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
index 4de42c0fecd..ac3213e7959 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
@@ -85,8 +85,8 @@ class SuperDeclarationMarkerNavigationHandler : GutterIconNavigationHandler<PsiE
         val elementName = elementDescriptor!!.name
         return NavigationPopupDescriptor(
             superDeclarations,
-            KotlinBundle.message("navigation.title.super.declaration", elementName),
-            KotlinBundle.message("navigation.findUsages.title.super.declaration", elementName),
+            KotlinBundle.message("overridden.marker.overrides.choose.implementation.title", elementName),
+            KotlinBundle.message("overridden.marker.overrides.choose.implementation.find.usages", elementName),
             KtFunctionPsiElementCellRenderer()
         )
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
index f6c9449146c..aa0210345f1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
@@ -116,7 +116,7 @@ class UnusedReceiverParameterInspection : AbstractKotlinInspection() {
             private fun registerProblem(receiverTypeReference: KtTypeReference, inSameClass: Boolean = false) {
                 holder.registerProblem(
                     receiverTypeReference,
-                    KotlinBundle.message("unused.receiver.parameter"),
+                    KotlinBundle.message("inspection.unused.receiver.parameter"),
                     ProblemHighlightType.LIKE_UNUSED_SYMBOL,
                     RemoveReceiverFix(inSameClass)
                 )
@@ -139,7 +139,7 @@ class UnusedReceiverParameterInspection : AbstractKotlinInspection() {
         override fun startInWriteAction() = false
 
         companion object {
-            private val actionName = KotlinBundle.message("unused.receiver.parameter.remove")
+            private val actionName = KotlinBundle.message("fix.unused.receiver.parameter.remove")
 
             private fun configureChangeSignature() = object : KotlinChangeSignatureConfiguration {
                 override fun performSilently(affectedFunctions: Collection<PsiElement>) = true
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt
index 8663091a8ff..6d977ee9fbd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractImportFix.kt
@@ -100,9 +100,9 @@ internal abstract class ImportFixBase<T : KtExpression> protected constructor(
         return createAction(project, editor, element).showHint()
     }
 
-    override fun getText() = KotlinBundle.message("import.fix")
+    override fun getText() = KotlinBundle.message("fix.import")
 
-    override fun getFamilyName() = KotlinBundle.message("import.fix")
+    override fun getFamilyName() = KotlinBundle.message("fix.import")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile) = element != null && suggestions.isNotEmpty()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
index 28675b11ae7..e84a84ad983 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
@@ -134,7 +134,7 @@ abstract class ChangeCallableReturnTypeFix(
             "Change $typeName of $functionPresentation to '$typePresentation'"
     }
 
-    override fun getFamilyName() = KotlinBundle.message("change.type.family")
+    override fun getFamilyName() = KotlinBundle.message("fix.change.return.type")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean {
         return !typeContainsError &&
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt
index 264c5ef56b2..258b7c4bb9a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt
@@ -94,7 +94,7 @@ class ChangeFunctionLiteralReturnTypeFix(
 
     override fun getText() = appropriateQuickFix?.text ?: "Change lambda expression return type to '$typePresentation'"
 
-    override fun getFamilyName() = KotlinBundle.message("change.type.family")
+    override fun getFamilyName() = KotlinBundle.message("fix.change.return.type")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean =
         functionLiteralReturnTypeRef != null || appropriateQuickFix != null && appropriateQuickFix.isAvailable(
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
index 035ac9568c2..b1a2f0336ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
@@ -50,7 +50,7 @@ class ChangeParameterTypeFix(element: KtParameter, type: KotlinType) : KotlinQui
             "Change parameter '${element.name}' type of function '$containingDeclarationName' to '$typePresentation'"
     }
 
-    override fun getFamilyName() = KotlinBundle.message("change.type.family")
+    override fun getFamilyName() = KotlinBundle.message("fix.change.return.type")
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val element = element ?: return
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
index a75ac184f65..e2e07de89b0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
@@ -78,7 +78,7 @@ open class ChangeVariableTypeFix(element: KtVariableDeclaration, type: KotlinTyp
         }
     }
 
-    override fun getFamilyName() = KotlinBundle.message("change.type.family")
+    override fun getFamilyName() = KotlinBundle.message("fix.change.return.type")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile) = !typeContainsError
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
index e9cf426e22e..5fd14d64a02 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
@@ -58,7 +58,7 @@ abstract class ExclExclCallFix(psiElement: PsiElement) : KotlinQuickFixAction<Ps
 }
 
 class RemoveExclExclCallFix(psiElement: PsiElement) : ExclExclCallFix(psiElement), CleanupFix, HighPriorityAction {
-    override fun getText(): String = KotlinBundle.message("remove.unnecessary.non.null.assertion")
+    override fun getText(): String = KotlinBundle.message("fix.remove.non.null.assertion")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean =
         getExclExclPostfixExpression() != null
@@ -87,7 +87,7 @@ class RemoveExclExclCallFix(psiElement: PsiElement) : ExclExclCallFix(psiElement
 class AddExclExclCallFix(psiElement: PsiElement, val checkImplicitReceivers: Boolean) : ExclExclCallFix(psiElement), LowPriorityAction {
     constructor(psiElement: PsiElement) : this(psiElement, true)
 
-    override fun getText() = KotlinBundle.message("introduce.non.null.assertion")
+    override fun getText() = KotlinBundle.message("fix.introduce.non.null.assertion")
 
     override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean =
         getExpressionForIntroduceCall() != null
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
index 8bbee6cf42f..981dbd17951 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 class InsertDelegationCallQuickfix(val isThis: Boolean, element: KtSecondaryConstructor) :
     KotlinQuickFixAction<KtSecondaryConstructor>(element) {
-    override fun getText() = KotlinBundle.message("insert.delegation.call", keywordToUse)
+    override fun getText() = KotlinBundle.message("fix.insert.delegation.call", keywordToUse)
     override fun getFamilyName() = "Insert explicit delegation call"
 
     private val keywordToUse = if (isThis) "this" else "super"
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
index 36bc676db6e..a00abbd72d6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
@@ -10,5 +10,5 @@ import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.psi.KtElement
 
 abstract class CreateFromUsageFixBase<T : KtElement>(element: T) : KotlinQuickFixAction<T>(element) {
-    override fun getFamilyName(): String = KotlinBundle.message("create.from.usage.family")
+    override fun getFamilyName(): String = KotlinBundle.message("fix.create.from.usage.family")
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
index 416cc0ca1ba..c555ad8b60e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
@@ -82,7 +82,7 @@ abstract class CreateCallableFromUsageFixBase<E : KtElement>(
         return if (isExtension || declaration.canRefactor()) declaration else null
     }
 
-    override fun getFamilyName(): String = KotlinBundle.message("create.from.usage.family")
+    override fun getFamilyName(): String = KotlinBundle.message("fix.create.from.usage.family")
 
     override fun getText(): String {
         val element = element ?: return ""
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
index 4fe1b611bbb..312a1cab6e7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
@@ -135,7 +135,7 @@ internal fun KtSimpleNameExpression.getCreatePackageFixIfApplicable(targetParent
     val javaFix = CreateClassOrPackageFix.createFix(fullName, resolveScope, this, basePackage, null, null, null) ?: return null
 
     return object : DelegatingIntentionAction(javaFix) {
-        override fun getFamilyName(): String = KotlinBundle.message("create.from.usage.family")
+        override fun getFamilyName(): String = KotlinBundle.message("fix.create.from.usage.family")
 
         override fun getText(): String = "Create package '$fullName'"
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
index a3861957c63..27a68cc4e16 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
@@ -37,7 +37,7 @@ object CreateLocalVariableActionFactory : KotlinSingleIntentionActionFactory() {
             .firstOrNull() as? KtElement ?: return null
 
         return object : CreateFromUsageFixBase<KtSimpleNameExpression>(refExpr) {
-            override fun getText(): String = KotlinBundle.message("create.local.variable.from.usage", propertyName)
+            override fun getText(): String = KotlinBundle.message("fix.create.from.usage.local.variable", propertyName)
 
             override fun invoke(project: Project, editor: Editor?, file: KtFile) {
                 val assignment = refExpr.getAssignmentByLHS()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
index 7b7d7078de3..62fab5f2086 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
@@ -82,7 +82,7 @@ abstract class CallableRefactoring<out T : CallableDescriptor>(
             it.containingDeclaration.name.asString()
         }
         val message = KotlinBundle.message(
-            "x.overrides.y.in.class.list",
+            "override.declaration.x.overrides.y.in.class.list",
             DescriptorRenderer.COMPACT.render(callableFromEditor),
             superString,
             "refactor"
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index 302548ac3d0..671301df71c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -876,7 +876,7 @@ fun checkSuperMethods(
         val superClassDescriptions = getClassDescriptions(overriddenElementsToDescriptor)
 
         val message = KotlinBundle.message(
-            "x.overrides.y.in.class.list",
+            "override.declaration.x.overrides.y.in.class.list",
             DescriptorRenderer.COMPACT_WITH_SHORT_TYPES.render(declarationDescriptor),
             "\n${superClassDescriptions.joinToString(separator = "")}",
             actionString
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192
index 342a9ff799f..a0ddc5b59d8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.192
@@ -877,7 +877,7 @@ fun checkSuperMethods(
         val superClassDescriptions = getClassDescriptions(overriddenElementsToDescriptor)
 
         val message = KotlinBundle.message(
-            "x.overrides.y.in.class.list",
+            "override.declaration.x.overrides.y.in.class.list",
             DescriptorRenderer.COMPACT_WITH_SHORT_TYPES.render(declarationDescriptor),
             "\n${superClassDescriptions.joinToString(separator = "")}",
             actionString
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
index 71ff55b8f6b..dcde0126852 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
@@ -86,7 +86,7 @@ class KotlinOverridingDialog extends DialogWrapper {
             myMethodText[i] = formatElement(((KotlinSafeDeleteOverridingUsageInfo) myOverridingMethods.get(i)).getOverridingElement());
         }
         myUsagePreviewPanel = new UsagePreviewPanel(project, new UsageViewPresentation());
-        setTitle(KotlinBundle.message("unused.overriding.methods.title"));
+        setTitle(KotlinBundle.message("override.declaration.unused.overriding.methods.title"));
         init();
     }
 
@@ -100,7 +100,7 @@ class KotlinOverridingDialog extends DialogWrapper {
                 DeclarationDescriptor containingDescriptor = declarationDescriptor.getContainingDeclaration();
                 if (containingDescriptor instanceof ClassDescriptor) {
                     return KotlinBundle.message(
-                            "x.in.y",
+                            "override.declaration.x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
                             IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
                     );
@@ -144,8 +144,8 @@ class KotlinOverridingDialog extends DialogWrapper {
     protected JComponent createNorthPanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.add(new JLabel(KotlinBundle.message("there.are.unused.methods.that.override.methods.you.delete")));
-        panel.add(new JLabel(KotlinBundle.message("choose.the.ones.you.want.to.be.deleted")));
+        panel.add(new JLabel(KotlinBundle.message("override.declaration.unused.overriding.methods.description")));
+        panel.add(new JLabel(KotlinBundle.message("override.declaration.choose.to.delete")));
         return panel;
     }
 
@@ -251,7 +251,7 @@ class KotlinOverridingDialog extends DialogWrapper {
                 case CHECK_COLUMN:
                     return " ";
                 default:
-                    return KotlinBundle.message("method.column");
+                    return KotlinBundle.message("override.declaration.member");
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 39980f16d05..335152f32d3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -339,7 +339,7 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
                 .filter { overridenDescriptor -> overridenDescriptor.modality == Modality.ABSTRACT }
                 .mapTo(ArrayList()) { overridenDescriptor ->
                     KotlinBundle.message(
-                        "x.implements.y",
+                        "override.declaration.x.implements.y",
                         formatFunction(declarationDescriptor, true),
                         formatClass(declarationDescriptor.containingDeclaration, true),
                         formatFunction(overridenDescriptor, true),
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/utils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/utils.kt
index fa130f8aeb9..93410b83b4a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/utils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/utils.kt
@@ -70,7 +70,7 @@ fun checkParametersInMethodHierarchy(parameter: PsiParameter): Collection<PsiEle
     val parametersToDelete = collectParametersHierarchy(method, parameter)
     if (parametersToDelete.size <= 1 || ApplicationManager.getApplication().isUnitTestMode) return parametersToDelete
 
-    val message = KotlinBundle.message("delete.param.in.method.hierarchy", formatJavaOrLightMethod(method))
+    val message = KotlinBundle.message("override.declaration.delete.multiple.parameters", formatJavaOrLightMethod(method))
     val exitCode = Messages.showOkCancelDialog(parameter.project, message, IdeBundle.message("title.warning"), Messages.getQuestionIcon())
     return if (exitCode == Messages.OK) parametersToDelete else null
 }
diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
index 649ddd64433..0fc39697ec8 100644
--- a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
+++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt
@@ -12,9 +12,9 @@ class A {
                 val containingDescriptor = declarationDescriptor.getContainingDeclaration()
                 if (containingDescriptor is ClassDescriptor) {
                     return JetBundle.message(
-                            "x.in.y",
-                            DescriptorRenderer.COMPACT.render(declarationDescriptor),
-                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
+                        "override.declaration.x.in.y",
+                        DescriptorRenderer.COMPACT.render(declarationDescriptor),
+                        IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
                     )
                 }
             }
diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.java b/idea/testData/copyPaste/conversion/SeveralMethodsSample.java
index 06fdf2f90f3..cba59f242b5 100644
--- a/idea/testData/copyPaste/conversion/SeveralMethodsSample.java
+++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.java
@@ -10,7 +10,7 @@ class A {
                 DeclarationDescriptor containingDescriptor = declarationDescriptor.getContainingDeclaration();
                 if (containingDescriptor instanceof ClassDescriptor) {
                     return JetBundle.message(
-                            "x.in.y",
+                            "override.declaration.x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
                             IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
                     );
diff --git a/nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt b/nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt
index e64827908f4..83078a52a58 100644
--- a/nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt
+++ b/nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt
@@ -11,9 +11,9 @@ class A {
                 val containingDescriptor: DeclarationDescriptor = declarationDescriptor.getContainingDeclaration()
                 if (containingDescriptor is ClassDescriptor) {
                     return JetBundle.message(
-                            "x.in.y",
-                            DescriptorRenderer.COMPACT.render(declarationDescriptor),
-                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
+                        "override.declaration.x.in.y",
+                        DescriptorRenderer.COMPACT.render(declarationDescriptor),
+                        IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
                     )
                 }
             }
diff --git a/nj2k/testData/copyPaste/SeveralMethodsSample.java b/nj2k/testData/copyPaste/SeveralMethodsSample.java
index 06fdf2f90f3..cba59f242b5 100644
--- a/nj2k/testData/copyPaste/SeveralMethodsSample.java
+++ b/nj2k/testData/copyPaste/SeveralMethodsSample.java
@@ -10,7 +10,7 @@ class A {
                 DeclarationDescriptor containingDescriptor = declarationDescriptor.getContainingDeclaration();
                 if (containingDescriptor instanceof ClassDescriptor) {
                     return JetBundle.message(
-                            "x.in.y",
+                            "override.declaration.x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
                             IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
                     );