From 94d10c7c6326abab1f124890f345e7cd3a3803dd Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Tue, 25 Feb 2020 15:37:56 +0700
Subject: [PATCH] i18n: move to KotlinBundle

---
 .../kotlin/idea/KotlinBundle.properties       | 533 ++++++++++++++++--
 .../org/jetbrains/kotlin/idea/KotlinBundle.kt |  17 +-
 .../KotlinConfigurationBundle.properties      |  46 --
 .../messages/KotlinCopyBundle.properties      |   6 -
 .../messages/KotlinEditorBundle.properties    |   4 -
 .../messages/KotlinFacetBundle.properties     |  14 -
 .../messages/KotlinFiltersBundle.properties   |   3 -
 .../KotlinFindUsagesBundle.properties         |  51 --
 .../messages/KotlinFormatterBundle.properties |  34 --
 .../messages/KotlinFrameworkBundle.properties |   1 -
 .../messages/KotlinHierarchyBundle.properties |   2 -
 .../KotlinHighlighterBundle.properties        |  88 ---
 .../messages/KotlinImportsBundle.properties   |   5 -
 .../messages/KotlinInternalBundle.properties  |   4 -
 .../KotlinRefactoringBundle.properties        | 174 ------
 .../messages/KotlinReporterBundle.properties  |   5 -
 .../messages/KotlinRootsBundle.properties     |   1 -
 .../messages/KotlinScriptBundle.properties    |   6 -
 .../messages/KotlinSlicerBundle.properties    |   5 -
 .../KotlinTestIntegrationBundle.properties    |   5 -
 .../messages/KotlinUpdateBundle.properties    |   6 -
 .../messages/KotlinVersionBundle.properties   |   3 -
 .../KotlinCompilerConfigurableTab.java        |  36 +-
 .../KotlinCompilerConfigurableTab.java.192    |  30 +-
 .../configuration/ExperimentalFeatures.kt     |   4 +-
 .../KotlinConfigurationBundle.kt              |  18 -
 .../KotlinLanguageConfiguration.kt            |  25 +-
 .../outdatedBundledCompilerNotification.kt    |   9 +-
 .../ui/KotlinLanguageConfigurationForm.java   |   6 +-
 .../configuration/ui/NotPropertyListPanel.kt  |  12 +-
 .../configuration/ui/migrationNotification.kt |  22 +-
 .../copy/ConvertJavaCopyPasteProcessor.kt     |   3 +-
 .../idea/conversion/copy/CopiedKotlinCode.kt  |   3 +-
 .../idea/conversion/copy/KotlinCopyBundle.kt  |  18 -
 .../copy/KotlinPasteFromJavaDialog.java       |   6 +-
 .../copy/PlainTextPasteImportResolver.kt      |   5 +-
 .../kotlin/idea/editor/KotlinEditorBundle.kt  |  18 -
 .../KotlinEditorOptionsConfigurable.java      |   9 +-
 .../kotlin/idea/facet/KotlinFacetBundle.kt    |  18 -
 .../facet/KotlinFacetCompilerPluginsTab.kt    |   9 +-
 .../idea/facet/KotlinFacetEditorGeneralTab.kt |  27 +-
 .../filters/InlineFunctionHyperLinkInfo.kt    |   7 +-
 .../idea/filters/KotlinFiltersBundle.kt       |  18 -
 .../KotlinElementDescriptionProvider.kt       |  45 +-
 .../idea/findUsages/KotlinFindUsagesBundle.kt |  21 -
 .../KotlinFindUsagesHandlerFactory.kt         |   5 +-
 .../findUsages/KotlinFindUsagesProvider.kt    |  19 +-
 .../findUsages/KotlinUsageTypeProvider.kt     |  47 +-
 .../findUsages/KotlinUsageTypeProvider.kt.201 |  47 +-
 .../dialogs/KotlinFindClassUsagesDialog.java  |   5 +-
 .../KotlinFindFunctionUsagesDialog.java       |   3 +-
 .../KotlinFindPropertyUsagesDialog.java       |   9 +-
 .../handlers/KotlinFindMemberUsagesHandler.kt |   5 +-
 .../idea/formatter/ImportSettingsPanel.kt     |  18 +-
 .../idea/formatter/KotlinFormatterBundle.kt   |  18 -
 ...KotlinLanguageCodeStyleSettingsProvider.kt |  63 ++-
 .../idea/formatter/KotlinSaveStylePanel.kt    |   5 +-
 .../idea/framework/KotlinFrameworkBundle.kt   |  18 -
 .../kotlin/idea/framework/KotlinSdkType.kt    |   3 +-
 .../idea/framework/KotlinSdkType.kt.192       |   3 +-
 .../idea/hierarchy/KotlinHierarchyBundle.kt   |  18 -
 .../KotlinCallHierarchyNodeDescriptor.kt      |   4 +-
 .../KotlinOverrideHierarchyNodeDescriptor.kt  |   4 +-
 .../highlighter/KotlinColorSettingsPage.kt    |  95 ++--
 .../highlighter/KotlinHighlighterBundle.kt    |  18 -
 .../KotlinRecursiveCallLineMarkerProvider.kt  |   3 +-
 .../KotlinSuspendCallLineMarkerProvider.kt    |   5 +-
 .../KotlinTestRunLineMarkerContributor.kt     |   3 +-
 .../dsl/DslHighlighterExtension.kt            |   6 +-
 .../markers/DslHighlightingMarker.kt          |   4 +-
 .../highlighter/markers/HasActualMarker.kt    |  10 +-
 .../highlighter/markers/HasExpectedMarker.kt  |   8 +-
 .../markers/KotlinLineMarkerOptions.kt        |  16 +-
 .../markers/KotlinLineMarkerProvider.kt       |  20 +-
 .../markers/OverridenFunctionMarker.kt        |  18 +-
 .../markers/OverridenPropertyMarker.kt        |   4 +-
 .../markers/SuperDeclarationMarker.kt         |  13 +-
 .../idea/imports/KotlinImportOptimizer.kt     |  15 +-
 .../idea/imports/KotlinImportsBundle.kt       |  18 -
 .../idea/internal/KotlinDecompilerAdapter.kt  |   9 +-
 .../idea/internal/KotlinInternalBundle.kt     |  18 -
 .../refactoring/KotlinRefactoringBundle.kt    |  18 -
 .../changeSignature/KotlinChangeSignature.kt  |   8 +-
 .../KotlinChangeSignatureHandler.kt           |  13 +-
 .../KotlinChangeSignatureProcessor.kt         |   6 +-
 .../KotlinChangeSignatureUsageProcessor.kt    |  29 +-
 .../changeSignature/ui/KotlinCallerChooser.kt |   8 +-
 .../ui/KotlinChangePropertySignatureDialog.kt |  27 +-
 .../ui/KotlinChangeSignatureDialog.kt         |  24 +-
 .../ui/KotlinChangeSignatureDialog.kt.192     |  22 +-
 .../ui/KotlinFunctionParameterTableModel.java |   4 +-
 ...PrimaryConstructorParameterTableModel.java |   4 +-
 .../copy/CopyKotlinDeclarationDialog.kt       |   4 +-
 .../copy/CopyKotlinDeclarationsHandler.kt     |  15 +-
 .../MoveDeclarationsIntentionAction.kt        |   7 +-
 .../idea/refactoring/elementSelectionUtils.kt |   6 +-
 .../inline/AbstractKotlinInlineDialog.kt      |  13 +-
 .../inline/KotlinInlineCallableProcessor.kt   |  20 +-
 .../inline/KotlinInlineFunctionHandler.kt     |   6 +-
 .../inline/KotlinInlineTypeAliasHandler.kt    |   6 +-
 .../inline/KotlinInlineValDialog.kt           |   4 +-
 .../inline/KotlinInlineValHandler.kt          |  23 +-
 .../idea/refactoring/inline/inlineUtils.kt    |  16 +-
 .../extractClass/ExtractSuperRefactoring.kt   |   5 +-
 .../KotlinExtractInterfaceHandler.kt          |   6 +-
 .../KotlinExtractSuperHandlerBase.kt          |   9 +-
 .../KotlinExtractSuperclassHandler.kt         |   6 +-
 .../ui/KotlinExtractSuperDialogBase.kt        |   8 +-
 .../ExtractKotlinFunctionHandler.kt           |   6 +-
 .../ui/ExtractFunctionParameterTablePanel.kt  |   6 +-
 .../ui/KotlinExtractFunctionDialog.java       |   7 +-
 .../ExtractableCodeDescriptor.kt              |  14 +-
 .../extractionEngine/ExtractionEngine.kt      |   4 +-
 .../extractionEngine/duplicateUtil.kt         |   7 +-
 .../extractableAnalysisUtil.kt                |   4 +-
 .../extractionEngine/extractorUtil.kt         |   8 +-
 .../KotlinIntroduceImportAliasHandler.kt      |   4 +-
 .../KotlinInplaceParameterIntroducer.kt       |   7 +-
 .../KotlinIntroduceParameterDialog.kt         |  30 +-
 .../KotlinIntroduceParameterHandler.kt        |  21 +-
 .../KotlinInplacePropertyIntroducer.kt        |   7 +-
 .../KotlinIntroducePropertyHandler.kt         |   8 +-
 .../IntroduceTypeAliasHandler.kt              |  11 +-
 .../introduceTypeAliasImpl.kt                 |  14 +-
 .../ui/KotlinIntroduceTypeAliasDialog.java    |   4 +-
 .../KotlinIntroduceTypeParameterHandler.kt    |  12 +-
 .../refactoring/introduce/introduceUtil.kt    |   8 +-
 .../KotlinInplaceVariableIntroducer.java      |   6 +-
 .../KotlinIntroduceVariableHandler.kt         |  23 +-
 .../KotlinVariableInplaceIntroducer.kt        |   6 +-
 .../introduceVariableUtils.kt                 |   6 +-
 .../ui/AbstractParameterTablePanel.kt         |   4 +-
 .../ui/MoveKotlinTopLevelDeclarationsModel.kt |   6 +-
 .../idea/refactoring/rename/renameUtil.kt     |   4 +-
 .../idea/reporter/KotlinReportSubmitter.kt    |  11 +-
 .../idea/reporter/KotlinReporterBundle.kt     |  18 -
 ...KotlinNonJvmSourceRootConverterProvider.kt |   3 +-
 .../kotlin/idea/roots/KotlinRootsBundle.kt    |  18 -
 .../kotlin/idea/script/KotlinScriptBundle.kt  |  18 -
 .../KotlinScriptingSettingsConfigurable.java  |   4 +-
 .../MultipleScriptDefinitionsChecker.kt       |  13 +-
 .../scriptsTemplatesFromDependencies.kt       |   3 +-
 .../slicer/KotlinSliceDereferenceUsage.kt     |   3 +-
 .../slicer/KotlinSliceDereferenceUsage.kt.191 |   3 +-
 .../slicer/KotlinSliceUsageCellRenderer.kt    |  10 +-
 .../kotlin/idea/slicer/KotlinSlicerBundle.kt  |  18 -
 .../KotlinUsageContextDataFlowPanelBase.kt    |   5 +-
 ...KotlinUsageContextDataFlowPanelBase.kt.201 |   5 +-
 .../KotlinCreateTestIntention.kt              |  11 +-
 .../KotlinTestIntegrationBundle.kt            |  18 -
 .../update/GooglePluginUpdateVerifier.kt.as35 |  14 +-
 .../update/GooglePluginUpdateVerifier.kt.as36 |  14 +-
 .../update/GooglePluginUpdateVerifier.kt.as40 |  14 +-
 .../kotlin/idea/update/KotlinUpdateBundle.kt  |  18 -
 .../idea/versions/KotlinRuntimeLibraryUtil.kt |  13 +-
 .../idea/versions/KotlinVersionBundle.kt      |  18 -
 156 files changed, 1195 insertions(+), 1570 deletions(-)
 delete mode 100644 idea/resources/messages/KotlinConfigurationBundle.properties
 delete mode 100644 idea/resources/messages/KotlinCopyBundle.properties
 delete mode 100644 idea/resources/messages/KotlinEditorBundle.properties
 delete mode 100644 idea/resources/messages/KotlinFacetBundle.properties
 delete mode 100644 idea/resources/messages/KotlinFiltersBundle.properties
 delete mode 100644 idea/resources/messages/KotlinFindUsagesBundle.properties
 delete mode 100644 idea/resources/messages/KotlinFormatterBundle.properties
 delete mode 100644 idea/resources/messages/KotlinFrameworkBundle.properties
 delete mode 100644 idea/resources/messages/KotlinHierarchyBundle.properties
 delete mode 100644 idea/resources/messages/KotlinHighlighterBundle.properties
 delete mode 100644 idea/resources/messages/KotlinImportsBundle.properties
 delete mode 100644 idea/resources/messages/KotlinInternalBundle.properties
 delete mode 100644 idea/resources/messages/KotlinRefactoringBundle.properties
 delete mode 100644 idea/resources/messages/KotlinReporterBundle.properties
 delete mode 100644 idea/resources/messages/KotlinRootsBundle.properties
 delete mode 100644 idea/resources/messages/KotlinScriptBundle.properties
 delete mode 100644 idea/resources/messages/KotlinSlicerBundle.properties
 delete mode 100644 idea/resources/messages/KotlinTestIntegrationBundle.properties
 delete mode 100644 idea/resources/messages/KotlinUpdateBundle.properties
 delete mode 100644 idea/resources/messages/KotlinVersionBundle.properties
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt

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 0439efe028a..155eb3bea57 100644
--- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
+++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
@@ -180,53 +180,6 @@ fix.unused.receiver.parameter.remove=Remove redundant receiver parameter
 inspection.migration.title=Code Migration
 inspection.migration.profile.name=Migration
 
-options.color.attribute.descriptor.annotation=Annotation//Annotation name
-description.text.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
-
 fix.create.from.usage.family=Create from usage
 fix.create.from.usage.local.variable=Create local variable ''{0}''
 
@@ -466,4 +419,488 @@ presentation.text.for.receiver.in.container.paren=(for {0} in {1})
 presentation.text.object.in.container=object in {0}
 
 project.view.class.initializer=class initializer
->>>>>>> i18n: Internationalize part of the 'idea' module
+
+copy.text.adding.imports=Adding imports ...
+copy.text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin=Clipboard content seems to be Java code. Do you want to convert it to Kotlin?
+copy.text.convert.java.to.kotlin=Convert Java to Kotlin
+copy.text.copied.kotlin.code=Copied kotlin code
+copy.text.resolving.references=Resolving references ...
+copy.title.convert.code.from.java=Convert Code From Java
+
+editor.checkbox.title.auto.add.val.keyword.to.data.inline.class.constructor.parameters=Auto add val keyword to data/inline class constructor parameters
+editor.checkbox.title.convert.pasted.java.code.to.kotlin=Convert pasted Java code to Kotlin
+editor.checkbox.title.don.t.show.java.to.kotlin.conversion.dialog.on.paste=Don''t show Java to Kotlin conversion dialog on paste
+editor.title.kotlin=Kotlin
+
+facet.checkbox.text.use.project.settings=Use project settings
+facet.column.name.options=Options
+facet.column.name.plugin=Plugin
+facet.error.text.at.least.one.target.platform.should.be.selected=At least one target platform should be selected
+facet.label.text.selected.target.platforms=Selected target platforms:
+facet.label.text.target.platform=Target platform:
+facet.label.text.the.project.is.imported.from.external.build.system.and.could.not.be.edited=The project is imported from external build system and could not be edited
+facet.link.text.edit.project.settings=Edit project settings
+facet.name.compiler.plugins=Compiler Plugins
+facet.name.general=General
+facet.text.following.arguments.are.redundant=Following arguments are redundant: {0}
+facet.text.following.arguments.override.facet.settings=Following arguments override facet settings: {0}
+facet.text.following.options.are.not.correct=Following options are not correct:
+facet.text.multiplatform=Multiplatform
+
+filters.text.inline.function.body=inline function body
+filters.text.inline.function.call.site=inline function call site
+filters.title.navigate.to=Navigate to
+
+find.usages.class=class
+find.usages.companion.object=companion object
+find.usages.constructor=constructor
+find.usages.facade.class=facade class
+find.usages.for.property={0} for property
+find.usages.function=function
+find.usages.getter=getter
+find.usages.import.alias=import alias
+find.usages.interface=interface
+find.usages.label=label
+find.usages.lambda=lambda
+find.usages.object=object
+find.usages.parameter=parameter
+find.usages.property.accessor=property accessor
+find.usages.property=property
+find.usages.setter=setter
+find.usages.type.alias=type alias
+find.usages.type.parameter=type parameter
+find.usages.variable=variable
+find.usages.checkbox.name.expected.classes=Expected classes
+find.usages.class.name.anonymous=Anonymous
+find.usages.checkbox.name.expected.functions=Expected functions
+find.usages.text.find.usages.for.data.class.components.and.destruction.declarations=<p>Find usages for data class components and destruction declarations<br/>could be <a href="{0}">disabled once</a> or <a href="{1}">disabled for a project</a>.</p>
+find.usages.tool.tip.text.disable.search.for.data.class.components.and.destruction.declarations.project.wide.setting=Disable search for data class components and destruction declarations. (Project wide setting)
+find.usages.checkbox.text.fast.data.class.component.search=Fast data class component search
+find.usages.checkbox.name.expected.properties=Expected properties
+find.usages.action.text.find.usages.of=find usages of
+find.usages.type.named.argument=Named argument
+find.usages.type.type.alias=Type alias
+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
+
+formatter.button.text.use.import.with.when.at.least=Use import with ''*'' when at least
+formatter.button.text.use.import.with=Use import with ''*''
+formatter.button.text.use.single.name.import=Use single name import
+formatter.checkbox.text.insert.imports.for.nested.classes=Insert imports for nested classes
+formatter.text.names.used=\ names used
+formatter.text.use.defaults.from=Use defaults from:
+formatter.title.after.colon.before.declaration.type=After colon, before declaration type
+formatter.title.after.colon.in.new.type.definition=After colon in new type definition
+formatter.title.align.when.branches.in.columns=Align ''when'' branches in columns
+formatter.title.around.arrow.in.function.types=Around arrow in function types
+formatter.title.around.arrow.in=Around arrow in "when" clause
+formatter.title.around.when.branches.with=Around ''when'' branches with {}
+formatter.title.before.colon.after.declaration.name=Before colon, after declaration name
+formatter.title.before.colon.in.new.type.definition=Before colon in new type definition
+formatter.title.before.lambda.arrow=Before lambda arrow
+formatter.title.chained.function.calls=Chained function calls
+formatter.title.elvis.expressions=Elvis expressions
+formatter.title.expression.body.functions=Expression body functions
+formatter.title.function.annotations=Function annotations
+formatter.title.function.call.arguments=Function call arguments
+formatter.title.function.declaration.parameters=Function declaration parameters
+formatter.title.function.parentheses=Function parentheses
+formatter.title.in.simple.one.line.methods=In simple one line methods
+formatter.title.java.statics.and.enum.members=Java Statics and Enum Members
+formatter.title.load.save=Load/Save
+formatter.title.other=Other
+formatter.title.property.annotations=Property annotations
+formatter.title.put.left.brace.on.new.line=Put left brace on new line
+formatter.title.range.operator=Range operator (..)
+formatter.title.top.level.symbols=Top-level Symbols
+formatter.title.use.continuation.indent.in.conditions=Use continuation indent in conditions
+formatter.title.use.continuation.indent=Use continuation indent
+formatter.title.when.parentheses=''when'' parentheses
+formatter.title.when.statements=''when'' statements
+
+framework.name.kotlin.sdk=Kotlin SDK
+
+hierarchy.text.anonymous=[anonymous]
+hierarchy.text.in=\ in {0}
+
+highlighter.action.text.go.to.actual.declarations=Go to actual declarations
+highlighter.action.text.go.to.expected.declaration=Go to expected declaration
+highlighter.action.text.go.to.implementations=Go to implementations
+highlighter.action.text.go.to.overridden.methods=Go to overridden methods
+highlighter.action.text.go.to.overridden.properties=Go to overridden properties
+highlighter.action.text.go.to.subclasses=Go to subclasses
+highlighter.action.text.go.to.super.method=Go to super method
+highlighter.action.text.go.to.super.property=Go to super property
+highlighter.descriptor.text.android.extensions.property=Properties and Variables//Android Extensions synthetic properties
+highlighter.descriptor.text.annotation=Annotation//Annotation name
+highlighter.descriptor.text.annotation.attribute.name=Annotation//Annotation attribute name
+highlighter.descriptor.text.arrow=Braces and Operators//Arrow
+highlighter.descriptor.text.builtin.annotation=Keywords//Modifier
+highlighter.descriptor.text.builtin.keyword.val=Keywords//'val'
+highlighter.descriptor.text.builtin.keyword.var=Keywords//'var'
+highlighter.descriptor.text.builtin.keyword=Keywords//Keyword
+highlighter.descriptor.text.captured.variable=Properties and Variables//Variables and values captured in a closure
+highlighter.descriptor.text.closure.braces=Braces and Operators//Lambda expression braces and arrow
+highlighter.descriptor.text.colon=Braces and Operators//Colon
+highlighter.descriptor.text.constructor.call=Functions//Constructor call
+highlighter.descriptor.text.double.colon=Braces and Operators//Double colon
+highlighter.descriptor.text.dynamic.fun.call=Functions//Dynamic function call
+highlighter.descriptor.text.dynamic.property=Properties and Variables//Dynamic property
+highlighter.descriptor.text.enumEntry=Classes and Interfaces//Enum entry
+highlighter.descriptor.text.exclexcl=Braces and Operators//Non-null assertion
+highlighter.descriptor.text.extension.fun.call=Functions//Extension function call
+highlighter.descriptor.text.extension.property=Properties and Variables//Extension property
+highlighter.descriptor.text.field=Properties and Variables//Backing field variable
+highlighter.descriptor.text.fun.call=Functions//Function call
+highlighter.descriptor.text.fun=Functions//Function declaration
+highlighter.descriptor.text.instance.property.custom.property.declaration=Properties and Variables//Instance property with custom property declarations
+highlighter.descriptor.text.instance.property=Properties and Variables//Instance property
+highlighter.descriptor.text.it=Parameters//Lambda expression default parameter
+highlighter.descriptor.text.kdoc.comment=Comments//KDoc//KDoc comment
+highlighter.descriptor.text.kdoc.tag=Comments//KDoc//KDoc tag
+highlighter.descriptor.text.kdoc.value=Comments//KDoc//Link in KDoc tag
+highlighter.descriptor.text.label=Label
+highlighter.descriptor.text.local.variable=Properties and Variables//Local variable or value
+highlighter.descriptor.text.named.argument=Named argument
+highlighter.descriptor.text.object=Classes and Interfaces//Object
+highlighter.descriptor.text.package.fun.call=Functions//Package-level function call
+highlighter.descriptor.text.package.property.custom.property.declaration=Properties and Variables//Package-level property with custom property declarations
+highlighter.descriptor.text.package.property=Properties and Variables//Package-level property
+highlighter.descriptor.text.quest=Braces and Operators//Type nullability marker
+highlighter.descriptor.text.safe.access=Braces and Operators//Safe access dot
+highlighter.descriptor.text.smart.cast.receiver=Smart-casts//Smart-cast implicit receiver
+highlighter.descriptor.text.smart.cast=Smart-casts//Smart-cast value
+highlighter.descriptor.text.smart.constant=Smart-casts//Smart constant
+highlighter.descriptor.text.string.escape=String//Escape in string and template braces
+highlighter.descriptor.text.suspend.fun.call=Functions//Suspend function call
+highlighter.descriptor.text.synthetic.extension.property=Properties and Variables//Synthetic extension property
+highlighter.descriptor.text.typeAlias=Classes and Interfaces//Type alias
+highlighter.descriptor.text.var=Properties and Variables//Var (mutable variable, parameter or property)
+highlighter.descriptor.text.variable.as.function.call=Properties and Variables//Variable as function call
+highlighter.descriptor.text.variable.as.function.like.call=Properties and Variables//Variable as function-like call
+highlighter.message.suspend.function.call=Suspend function call
+highlighter.message.suspending.iteration=Suspending iteration
+highlighter.name.dsl.markers=DSL markers
+highlighter.name.dsl=Dsl//
+highlighter.name.implemented.declaration=Implemented declaration
+highlighter.name.implementing.declaration=Implementing declaration
+highlighter.name.kotlin.line.markers=Kotlin line markers
+highlighter.name.multiplatform.actual.declaration=Multiplatform actual declaration
+highlighter.name.multiplatform.expect.declaration=Multiplatform expect declaration
+highlighter.name.overridden.declaration=Overridden declaration
+highlighter.name.overriding.declaration=Overriding declaration
+highlighter.name.style=Style
+highlighter.notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update=Navigation to overriding classes is not possible during index update
+highlighter.prefix.text.has.actuals.in=Has actuals in
+highlighter.text.click.for.navigate=Click {0}to navigate
+highlighter.text.has.functional.implementations=Has functional implementations
+highlighter.text.implements=Implements
+highlighter.text.in={0} in '{1}'
+highlighter.text.modules=\ ({0} modules)
+highlighter.text.or.press=\ or press {0}
+highlighter.text.overrides=Overrides
+highlighter.title.actuals.for=Actuals for {0}
+highlighter.title.choose.actual.for=Choose actual for {0}
+highlighter.title.choose.expected.for=Choose expected for {0}
+highlighter.title.expected.for=Expected for {0}
+highlighter.title.overriding.declarations.of=Overriding declarations of {0}
+highlighter.title.searching.for.overriding.declarations=Searching for overriding declarations
+highlighter.title.searching.for.overriding.methods=Searching for overriding methods
+highlighter.tool.tip.has.declaration.in.common.module=Has declaration in common module
+highlighter.tool.tip.marker.annotation.for.dsl=Marker annotation for DSL
+highlighter.tool.tip.text.function=function
+highlighter.tool.tip.text.property=property
+highlighter.tool.tip.text.recursive.call=Recursive call
+highlighter.tool.tip.text.run.test=Run Test
+
+import.optimizer.notification.text.unused.imports.not.found=Unused imports not found
+import.optimizer.progress.indicator.text.collect.imports.for=Collect imports for {0}
+import.optimizer.text.import={0, choice, 0#import|2#imports}
+import.optimizer.text.non.zero=Removed {0} {1}{2, choice, 0#|1#, added {2} {3}}
+import.optimizer.text.zero=Rearranged imports
+
+internal.action.text.decompile.kotlin.bytecode=Decompile kotlin bytecode
+internal.error.text.cannot.decompile=Cannot decompile {0}
+internal.indicator.text.decompiling=Decompiling {0}
+internal.title.decompiler.error=Decompiler error
+
+version.title.no.runtime.found=No Runtime Found
+version.dialog.message.is.not.found.make.sure.plugin.is.properly.installed={0} is not found. Make sure plugin is properly installed.
+version.message.is.deprecated.since.1.2.0.and.should.be.replaced.with={0} is deprecated since 1.2.0 and should be replaced with {1}
+
+update.name.android.studio=Android Studio
+update.reason.text.exception.during.verification=exception during verification {0}
+update.reason.text.no.verified.versions.for.this.build=No verified versions for this build.
+update.reason.text.unable.to.connect.to.compatibility.verification.repository=unable to connect to compatibility verification repository
+update.reason.text.unable.to.parse.compatibility.verification.metadata=unable to parse compatibility verification metadata
+update.reason.text.version.to.be.verified=Version to be verified.
+
+test.integration.button.text.cancel=Cancel
+test.integration.button.text.rewrite=Rewrite
+test.integration.message.text.create.test.in.the.same.source.root=Create test in the same source root?
+test.integration.message.text.kotlin.class=Kotlin class ''{0}'' already exists. Do you want to update it?
+test.integration.title.no.test.roots.found=No Test Roots Found
+
+slicer.text.in=\ in {0}
+slicer.text.tracking.enclosing.lambda=\ (Tracking enclosing lambda)
+slicer.title.dataflow.from.here=Dataflow from Here
+slicer.title.dataflow.to.here=Dataflow to Here
+slicer.tool.tip.text.variable.dereferenced=Variable dereferenced
+
+script.action.text.ignore=Ignore
+script.action.text.open.settings=Open Settings
+script.action.text.show.all=Show all
+script.name.kotlin.scripting=Kotlin Scripting
+script.progress.text.kotlin.scanning.dependencies.for.script.definitions=Kotlin: scanning dependencies for script definitions...
+script.text.multiple.script.definitions.are.applicable.for.this.script=Multiple script definitions are applicable for this script. {0} is used
+
+roots.description.text.update.source.roots.for.non.jvm.modules.in.kotlin.project=Update source roots for non-JVM modules in Kotlin project
+
+reporter.button.text.ignore=Ignore
+reporter.button.text.update=Update
+reporter.message.text.you.re.running.kotlin.plugin.version=You''re running Kotlin plugin version {0}, while the latest version is {1}
+reporter.text.can.t.report.exception.from.patched.plugin=Can''t report exception from patched plugin
+reporter.title.update.kotlin.plugin=Update Kotlin Plugin
+
+configuration.action.text.ignore=Ignore
+configuration.action.text.update=Update
+configuration.description.always=Always
+configuration.description.amd=AMD
+configuration.description.commonjs=CommonJS
+configuration.description.never=Never
+configuration.description.plain.put.to.global.scope=Plain (put to global scope)
+configuration.description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain=UMD (detect AMD or CommonJS if available, fallback to plain)
+configuration.description.when.inlining.a.function.from.other.module.with.embedded.sources=When inlining a function from other module with embedded sources
+configuration.error.text.shouldn.t.add.null.urls.to.custom.repositories=Shouldn''t add null urls to custom repositories
+configuration.feature.text.new.experimental.project.wizard=New Experimental Project Wizard
+configuration.feature.text.new.java.to.kotlin.converter=New Java to Kotlin Converter
+configuration.message.enter.fully.qualified.method.name=Enter fully-qualified method name:
+configuration.message.text.a.new.version.is.available=A new version {0} is available
+configuration.message.text.a.new.version.is.found=A new version {0} is found but it''s not verified by {1}.
+configuration.message.text.update.check.failed=Update check failed: {0}
+configuration.message.text.you.have.the.latest.version.of.the.plugin.installed=You have the latest version of the plugin installed.
+configuration.message.verifier.disabled=(verifier disabled)
+configuration.migration.text.api.version=API version: {0} -> {1}
+configuration.migration.text.detected.migration=Detected migration:
+configuration.migration.text.language.version=Language version: {0} -> {1}
+configuration.migration.text.migrations.for.kotlin.code.are.available=Migrations for Kotlin code are available
+configuration.migration.text.run.migrations=Run migrations
+configuration.migration.text.standard.library=Standard library: {0} -> {1}
+configuration.migration.title.kotlin.migration=Kotlin Migration
+configuration.name.kotlin.compiler=Kotlin Compiler
+configuration.name.kotlin=Kotlin
+configuration.name.method=Method
+configuration.status.text.installation.failed=Installation failed
+configuration.status.text.installing=Installing...
+configuration.text.add.exclusion=Add exclusion
+configuration.text.and=and
+configuration.text.other.s=other(s)
+configuration.text.patched.original={0} (Patched! Original: {1})
+configuration.text.the.compiler.bundled.to.kotlin.plugin=The compiler bundled to Kotlin plugin ({0}) is older than external compiler used for building modules:
+configuration.text.this.may.cause.different.set.of.errors.and.warnings.reported.in.ide.p=This may cause different set of errors and warnings reported in IDE.
+configuration.title.choose.output.directory=Choose Output Directory
+configuration.title.early.access.preview.1.3.x=Early Access Preview 1.3.x
+configuration.title.early.access.preview.1.4.x=Early Access Preview 1.4.x
+configuration.title.edit.exclusion=Edit exclusion
+configuration.title.kotlin.compiler.js.option.output.postfix.browse.title=Choose file to append to generated code
+configuration.title.kotlin.compiler.js.option.output.prefix.browse.title=Choose file to prepend to generated code
+configuration.title.outdated.bundled.kotlin.compiler=Outdated Bundled Kotlin Compiler
+configuration.title.stable=Stable
+configuration.warning.text.following.modules.override.project.settings=Following modules override project settings:
+configuration.warning.text.modules.override.project.settings={0} modules override project settings
+
+#Refactoring
+0.1.is.never.used={0} ''{1}'' is never used
+0.has.detected.1.code.fragments.in.2.that.can.be.replaced.with.3={0} has detected {1} code {1,choice,1#fragment|2#fragments} in {2} that can be replaced with {3}. Would you like to review and replace {1,choice,1#it|2#them}?
+0.usages.are.not.supported.by.the.inline.refactoring.they.won.t.be.processed={0} usages are not supported by the Inline refactoring. They won''t be processed.
+0.will.become.invisible.after.extraction={0} will become invisible after extraction
+0.will.no.longer.be.accessible.after.extraction={0} will no longer be accessible after extraction
+action.text.append=Append
+action.text.cancel=Cancel
+action.text.overwrite=Overwrite
+cannot.extract.method=Cannot find statements to extract
+cannot.extract.super.call=Cannot extract super-call
+cannot.inline.property.with.accessor.s.and.backing.field=Cannot inline property with accessor(s) and backing field
+cannot.introduce.parameter.of.0.type=Cannot introduce parameter of type ''{0}''
+cannot.refactor.expression.has.unit.type=Cannot introduce expression of unit type
+cannot.refactor.no.container=Cannot refactor in this place
+cannot.refactor.no.expression=Cannot perform refactoring without an expression
+cannot.refactor.no.type=Cannot perform refactoring without a type
+cannot.refactor.not.expression.to.extract=Cannot find an expression to extract
+cannot.refactor.not.expression=Cannot find an expression to introduce
+cannot.refactor.package.expression=Cannot introduce package reference
+cannot.refactor.syntax.errors=Cannot refactor due to erroneous code
+cannot.refactor.synthesized.function=Cannot refactor synthesized function ''{0}''
+checkbox.text.declare.with.var=Declare with &var
+checkbox.text.extension.property=E&xtension property:\u0020
+checkbox.text.introduce.default.value=Introduce &default value
+checkbox.text.replace.all.occurrences.0=&Replace all occurrences ({0})
+checkbox.text.specify.type.explicitly=Specify &type explicitly
+column.name.receiver=Receiver:
+column.name.val.var=Val/Var
+declarations.are.used.outside.of.selected.code.fragment=Following declarations are used outside of selected code fragment:
+declarations.will.move.out.of.scope=Following declarations won't be available outside of extracted function body:
+description.a.reference.to.extracted.type.parameter=a reference to extracted type parameter
+error.cant.refactor.vararg.functions=Can't refactor the function with variable arguments
+error.hint.text.cannot.inline.0.from.a.decompiled.file=Cannot inline ''{0}'' from a decompiled file
+error.text.can.t.change.signature.of.method=Can''t change signature of {0} method
+error.text.can.t.copy.class.to.the.containing.file=Can''t copy class to the containing file
+error.text.can.t.generate.0.1=Can''t generate {0}: {1}
+error.text.can.t.introduce.lambda.parameter.for.this.expression=Can''t introduce lambda parameter for this expression
+error.text.can.t.introduce.property.for.this.expression=Can''t introduce property for this expression
+error.text.different.name.expected=Different name expected
+error.text.expression.has.no.type=Expression has no type
+error.text.extraction.from.expect.class.is.not.yet.supported=Extraction from expect class is not yet supported
+error.text.extraction.from.non.jvm.class.is.not.yet.supported=Extraction from non-JVM class is not yet supported
+error.text.inline.function.is.not.supported.for.functions.with.multiple.return.statements=Inline Function is not supported for functions with multiple return statements.
+error.text.inline.function.is.not.supported.for.functions.with.return.statements.not.at.the.end.of.the.body=Inline Function is not supported for functions with return statements not at the end of the body.
+error.text.interface.cannot.be.extracted.from.an.annotation.class=Interface cannot be extracted from an annotation class
+error.text.introduce.parameter.is.not.available.for.default.value=Introduce Parameter is not available for default value
+error.text.introduce.parameter.is.not.available.inside.of.annotation.entries=Introduce Parameter is not available inside of annotation entries
+error.text.invalid.default.receiver.value=Invalid default receiver value
+error.text.invalid.name=Invalid name
+error.text.invalid.parameter.name=Invalid parameter name
+error.text.invalid.parameter.type=Invalid parameter type
+error.text.invalid.receiver.type=Invalid receiver type
+error.text.invalid.return.type=Invalid return type
+error.text.no.type.to.refactor=No type to refactor
+error.text.refactoring.is.not.applicable.in.the.current.context=Refactoring is not applicable in the current context
+error.text.superclass.cannot.be.extracted.from.an.annotation.class=Superclass cannot be extracted from an annotation class
+error.text.type.reference.is.expected=Type reference is expected
+error.types.in.generated.function=Cannot generate function with erroneous return type
+error.wrong.caret.position.function.or.constructor.name=The caret should be positioned at the name of the function or constructor to be refactored.
+extract.function=Extract Function
+family.name.update.usages.on.declarations.cut.paste=Update usages on declarations cut/paste
+file.does.not.exist=File {0} does not exist.\nDo you want to create it?
+function.name.is.invalid=Function name is invalid
+introduce.parameter=Introduce Parameter
+introduce.property=Introduce Property
+introduce.type.parameter.to.declaration=Introduce type parameter to declaration
+introduce.type.parameter=Introduce Type Parameter
+introduce.variable=Introduce Variable
+label.text.default.receiver.value=&Default receiver value:\u0020
+label.text.introduce.as=&Introduce as:\u0020
+label.text.name=&Name:\u0020
+label.text.receiver.type=Receiver &type:\u0020
+label.text.target.file.name=Target file name:
+label.text.type=&Type:\u0020
+label.text.visibility=&Visibility:\u0020
+message.change.signature.is.not.applicable.to.dynamically.invoked.functions=Change signature is not applicable to dynamically invoked functions
+message.do.not.show.for.local.variables.in.future=Do not show for local variables in future
+message.text.return.type.cannot.be.resolved=Return type ''{0}'' cannot be resolved.\nContinue?
+message.text.type.alias.0.is.never.used=Type alias ''{0}'' is never used
+message.type.for.cannot.be.resolved=Type ''{0}'' for {1} cannot be resolved.\nContinue?
+name.extract.interface=Extract Interface
+name.inline.type.alias=Inline Type Alias
+name.introduce.import.alias=Introduce Import Alias
+name.introduce.lambda.parameter=Introduce Lambda Parameter
+name.introduce.parameter1=Introduce Parameter
+name.introduce.type.alias=Introduce Type Alias
+name.kdoc.for.abstracts=KDoc for abstracts
+naming.convention.will.be.violated.after.rename=Naming conventions will be violated after rename
+non.kotlin.usage.0=Non-Kotlin usage: {0}
+parameter.name.is.invalid=Parameter name ''{0}'' is invalid
+parameter.type.is.invalid=Parameter type ''{0}'' is invalid
+parameter.types.are.not.denotable=Cannot extract method since following types are not denotable in the target scope:
+refactoring.move.non.kotlin.file=Target must be a Kotlin file
+return.type.is.invalid=Return type is invalid
+searching.usages.of.0.parameter=Searching usages of ''{0}''parameter
+selected.code.fragment.has.multiple.exit.points=Selected code fragment has multiple exit points
+selected.code.fragment.has.multiple.output.values=Selected code fragment has more than 3 output values:
+selected.code.fragment.has.output.values.and.exit.points=Selected code fragment has output values as well as alternative exit points
+setter.of.0.will.become.invisible.after.extraction = Setter of {0} will become invisible after extraction
+text.0.is.not.allowed.in.the.target.context=''{0}'' is not allowed in the target context
+text.0.to.inline={0} to inline
+text.0.will.no.longer.be.accessible.after.signature.change={0} will no longer be accessible after signature change
+text.all=All
+text.anonymous=[Anonymous]
+text.callee.text.would.be.shown.here=Callee text would be shown here
+text.caller.text.with.highlighted.callee.call.would.be.shown.here=Caller text\nwith highlighted callee call would be shown here
+text.cannot.inline.0.1.usages=Cannot inline {0}/{1} usages
+text.class.0.already.exists.in.the.target.scope=Class {0} already exists in the target scope 
+text.constructor=constructor
+text.create.destructuring.declaration=Create destructuring declaration
+text.create.single.variable=Create single variable
+text.declaration=declaration
+text.default.value=\ // default value = {0}
+text.duplicating.local.variable=Duplicating local variable ''{0}''
+text.duplicating.parameter=Duplicating parameter ''{0}''
+text.duplicating.property=Duplicating property ''{0}''
+text.explicit.receiver.is.already.present.in.call.element.0=Explicit receiver is already present in call element: {0}
+text.extract.superclass=Extract Superclass
+text.file.0.already.exists.in.1=File {0} already exists in {1}
+text.function.already.exists=Function already exists: ''{0}''
+text.function=function
+text.inline.0.1.2=Inline {0} ''{1}''? {2}
+text.inline.0=Inline {0}
+text.inline.all.references.and.0.the.1=Inline all references and {0} the kind {1}
+text.inline.recursive.function.is.supported.only.on.references=Inline recursive function is supported only on references
+text.inline.this.reference.and.keep.the.0=Inline this reference and keep the {0}
+text.inlining.0.1=Inlining {0} {1} 
+text.introduce.default.value=Intro&duce default value
+text.keep=keep
+text.lambda.parameter=lambda parameter
+text.lambda.parameters=Lambda &parameters:\u0020
+text.lambda.return.type=Lambda return &type
+text.lazy.property=lazy property
+text.local.property=property
+text.local.variable=local variable
+text.name=Name
+text.no.name.provided.for.type.alias=No name provided for type alias
+text.parameter.0=parameter ''{0}''
+text.parameter.name=Parameter &name:\u0020
+text.parameter.reference.can.t.be.safely.replaced.with.0.since.1.is.ambiguous.in.this.context=Parameter reference can''t be safely replaced with {0} since {1} is ambiguous in this context
+text.parameter.reference.can.t.be.safely.replaced.with.0.since.target.function.can.t.be.referenced.in.this.context=Parameter reference can''t be safely replaced with {0} since target function can''t be referenced in this context
+text.parameter.type=Parameter &type:\u0020
+text.parameter=parameter ''{0}''
+text.parameters=&Parameters
+text.proceed.with.extraction=Proceed with extraction
+text.process.duplicates=Process Duplicates
+text.property.with.getter=property with getter
+text.property.with.initializer=property with initializer
+text.property=property
+text.receiver.can.t.be.safely.transformed.to.value.argument=Receiver can''t be safely transformed to value argument: {0}
+text.receiver=receiver
+text.refactoring.can.t.be.performed.on.the.selected.code.element=Refactoring can''t be performed on the selected code element
+text.refactoring.is.not.applicable.to.this.code.fragment=Refactoring is not applicable to this code fragment
+text.remove.0.no.longer.used=Remove {0} no longer used
+text.remove=remove
+text.select.target.code.block.file=Select target code block / file
+text.select.target.code.block=Select target code block
+text.select.target.file=Select target file
+text.the.following=The following
+text.there.is.already.a.parameter=There is already a parameter ''{0}'' in {1}. It will conflict with the new parameter.
+text.there.is.already.a.variable.0.in.1.it.will.conflict.with.the.new.parameter=There is already a variable ''{0}'' in {1}. It will conflict with the new parameter.
+text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined=Type alias cannot refer to types which aren''t accessible in the scope where it''s defined
+text.type.alias.name.must.be.a.valid.identifier.0=Type alias name must be a valid identifier: {0}
+text.type.alias=type alias
+text.type.already.exists.in.the.target.scope=Type {0} already exists in the target scope
+text.type.parameter.names.must.be.distinct=Type parameter names must be distinct
+text.type.parameters=Type &Parameters
+text.type=Type
+text.update.usages.to.reflect.declaration.0.move=Update usages to reflect {0, choice, 0#declaration|1#declarations} move
+text.variable=variable
+title.inline.function=Inline Function
+title.introduce.parameter.to.declaration=Introduce parameter to declaration
+title.select.target.code.block=Select target code block
+unsupported.usage.0=Unsupported usage: {0}
+title.change.signature=Change Signature
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
index 03b2659a01b..3e42b9ac903 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt
@@ -15,20 +15,17 @@
  */
 package org.jetbrains.kotlin.idea
 
-import com.intellij.CommonBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase
-import java.util.*
+import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
-object KotlinBundle : KotlinBundleBase() {
-    @NonNls
-    private const val BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle"
+@NonNls
+private const val BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle"
 
-    override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
+object KotlinBundle : AbstractKotlinBundle(BUNDLE) {
+    @JvmStatic
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 
     @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String {
-        return CommonBundle.message(bundle, key, *params)
-    }
+    fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
 }
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinConfigurationBundle.properties b/idea/resources/messages/KotlinConfigurationBundle.properties
deleted file mode 100644
index 56287734de5..00000000000
--- a/idea/resources/messages/KotlinConfigurationBundle.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-action.text.ignore=Ignore
-action.text.update=Update
-description.always=Always
-description.amd=AMD
-description.commonjs=CommonJS
-description.never=Never
-description.plain.put.to.global.scope=Plain (put to global scope)
-description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain=UMD (detect AMD or CommonJS if available, fallback to plain)
-description.when.inlining.a.function.from.other.module.with.embedded.sources=When inlining a function from other module with embedded sources
-error.text.shouldn.t.add.null.urls.to.custom.repositories=Shouldn''t add null urls to custom repositories
-feature.text.new.experimental.project.wizard=New Kotlin project wizard
-feature.text.new.java.to.kotlin.converter=New Java to Kotlin converter
-message.enter.fully.qualified.method.name=Enter fully-qualified method name:
-message.text.a.new.version.is.available=A new version {0} is available
-message.text.a.new.version.is.found=A new version {0} is found but it''s not verified by {1}.
-message.text.update.check.failed=Update check failed: {0}
-message.text.you.have.the.latest.version.of.the.plugin.installed=You have the latest version of the plugin installed.
-message.verifier.disabled=(verifier disabled)
-migration.text.api.version=API version: {0} -> {1}
-migration.text.detected.migration=Detected migration:
-migration.text.language.version=Language version: {0} -> {1}
-migration.text.migrations.for.kotlin.code.are.available=Migrations for Kotlin code are available
-migration.text.run.migrations=Run migrations
-migration.text.standard.library=Standard library: {0} -> {1}
-migration.title.kotlin.migration=Kotlin Migration
-name.kotlin.compiler=Kotlin Compiler
-name.kotlin=Kotlin
-name.method=Method
-status.text.installation.failed=Installation failed
-status.text.installing=Installing...
-text.add.exclusion=Add exclusion
-text.and=and
-text.other.s=other(s)
-text.patched.original={0} (Patched! Original: {1})
-text.the.compiler.bundled.to.kotlin.plugin=The compiler bundled to Kotlin plugin ({0}) is older than external compiler used for building modules:
-text.this.may.cause.different.set.of.errors.and.warnings.reported.in.ide.p=This may cause different set of errors and warnings reported in IDE.
-title.choose.output.directory=Choose Output Directory
-title.early.access.preview.1.3.x=Early Access Preview 1.3.x
-title.early.access.preview.1.4.x=Early Access Preview 1.4.x
-title.edit.exclusion=Edit exclusion
-title.kotlin.compiler.js.option.output.postfix.browse.title=Choose file to append to generated code
-title.kotlin.compiler.js.option.output.prefix.browse.title=Choose file to prepend to generated code
-title.outdated.bundled.kotlin.compiler=Outdated Bundled Kotlin Compiler
-title.stable=Stable
-warning.text.following.modules.override.project.settings=Following modules override project settings:
-warning.text.modules.override.project.settings={0} modules override project settings
diff --git a/idea/resources/messages/KotlinCopyBundle.properties b/idea/resources/messages/KotlinCopyBundle.properties
deleted file mode 100644
index 8ebcfb906ea..00000000000
--- a/idea/resources/messages/KotlinCopyBundle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-text.adding.imports=Adding imports ...
-text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin=Clipboard content seems to be Java code. Do you want to convert it to Kotlin?
-text.convert.java.to.kotlin=Convert Java to Kotlin
-text.copied.kotlin.code=Copied kotlin code
-text.resolving.references=Resolving references ...
-title.convert.code.from.java=Convert Code From Java
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinEditorBundle.properties b/idea/resources/messages/KotlinEditorBundle.properties
deleted file mode 100644
index 3c1ad1f0f68..00000000000
--- a/idea/resources/messages/KotlinEditorBundle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-checkbox.title.auto.add.val.keyword.to.data.inline.class.constructor.parameters=Auto add val keyword to data/inline class constructor parameters
-checkbox.title.convert.pasted.java.code.to.kotlin=Convert pasted Java code to Kotlin
-checkbox.title.don.t.show.java.to.kotlin.conversion.dialog.on.paste=Don''t show Java to Kotlin conversion dialog on paste
-title.kotlin=Kotlin
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinFacetBundle.properties b/idea/resources/messages/KotlinFacetBundle.properties
deleted file mode 100644
index 9118ae780a4..00000000000
--- a/idea/resources/messages/KotlinFacetBundle.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-checkbox.text.use.project.settings=Use project settings
-column.name.options=Options
-column.name.plugin=Plugin
-error.text.at.least.one.target.platform.should.be.selected=At least one target platform should be selected
-label.text.selected.target.platforms=Selected target platforms:
-label.text.target.platform=Target platform:
-label.text.the.project.is.imported.from.external.build.system.and.could.not.be.edited=The project is imported from external build system and could not be edited
-link.text.edit.project.settings=Edit project settings
-name.compiler.plugins=Compiler Plugins
-name.general=General
-text.following.arguments.are.redundant=Following arguments are redundant: {0}
-text.following.arguments.override.facet.settings=Following arguments override facet settings: {0}
-text.following.options.are.not.correct=Following options are not correct:
-text.multiplatform=Multiplatform
diff --git a/idea/resources/messages/KotlinFiltersBundle.properties b/idea/resources/messages/KotlinFiltersBundle.properties
deleted file mode 100644
index 68a43e05c79..00000000000
--- a/idea/resources/messages/KotlinFiltersBundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-text.inline.function.body=inline function body
-text.inline.function.call.site=inline function call site
-title.navigate.to=Navigate to
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinFindUsagesBundle.properties b/idea/resources/messages/KotlinFindUsagesBundle.properties
deleted file mode 100644
index 5a2362a201a..00000000000
--- a/idea/resources/messages/KotlinFindUsagesBundle.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-kotlin.lang.class=class
-kotlin.lang.companion.object=companion object
-kotlin.lang.constructor=constructor
-kotlin.lang.facade.class=facade class
-kotlin.lang.for.property={0} for property
-kotlin.lang.function=function
-kotlin.lang.getter=getter
-kotlin.lang.import.alias=import alias
-kotlin.lang.interface=interface
-kotlin.lang.label=label
-kotlin.lang.lambda=lambda
-kotlin.lang.object=object
-kotlin.lang.parameter=parameter
-kotlin.lang.property.accessor=property accessor
-kotlin.lang.property=property
-kotlin.lang.setter=setter
-kotlin.lang.type.alias=type alias
-kotlin.lang.type.parameter=type parameter
-kotlin.lang.variable=variable
-checkbox.name.expected.classes=Expected classes
-class.name.anonymous=Anonymous
-checkbox.name.expected.functions=Expected functions
-text.find.usages.for.data.class.components.and.destruction.declarations=<p>Find usages for data class components and destruction declarations<br/>could be <a href="{0}">disabled once</a> or <a href="{1}">disabled for a project</a>.</p>
-tool.tip.text.disable.search.for.data.class.components.and.destruction.declarations.project.wide.setting=Disable search for data class components and destruction declarations. (Project wide setting)
-checkbox.text.fast.data.class.component.search=Fast data class component search
-checkbox.name.expected.properties=Expected properties
-action.text.find.usages.of=find usages of
-type.named.argument=Named argument
-type.type.alias=Type alias
-
-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
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinFormatterBundle.properties b/idea/resources/messages/KotlinFormatterBundle.properties
deleted file mode 100644
index 435163ba5da..00000000000
--- a/idea/resources/messages/KotlinFormatterBundle.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-button.text.use.import.with.when.at.least=Use import with ''*'' when at least
-button.text.use.import.with=Use import with ''*''
-button.text.use.single.name.import=Use single name import
-checkbox.text.insert.imports.for.nested.classes=Insert imports for nested classes
-text.names.used=\ names used
-text.use.defaults.from=Use defaults from:
-title.after.colon.before.declaration.type=After colon, before declaration type
-title.after.colon.in.new.type.definition=After colon in new type definition
-title.align.when.branches.in.columns=Align ''when'' branches in columns
-title.around.arrow.in.function.types=Around arrow in function types
-title.around.arrow.in=Around arrow in "when" clause
-title.around.when.branches.with=Around ''when'' branches with {}
-title.before.colon.after.declaration.name=Before colon, after declaration name
-title.before.colon.in.new.type.definition=Before colon in new type definition
-title.before.lambda.arrow=Before lambda arrow
-title.chained.function.calls=Chained function calls
-title.elvis.expressions=Elvis expressions
-title.expression.body.functions=Expression body functions
-title.function.annotations=Function annotations
-title.function.call.arguments=Function call arguments
-title.function.declaration.parameters=Function declaration parameters
-title.function.parentheses=Function parentheses
-title.in.simple.one.line.methods=In simple one line methods
-title.java.statics.and.enum.members=Java Statics and Enum Members
-title.load.save=Load/Save
-title.other=Other
-title.property.annotations=Property annotations
-title.put.left.brace.on.new.line=Put left brace on new line
-title.range.operator=Range operator (..)
-title.top.level.symbols=Top-level Symbols
-title.use.continuation.indent.in.conditions=Use continuation indent in conditions
-title.use.continuation.indent=Use continuation indent
-title.when.parentheses=''when'' parentheses
-title.when.statements=''when'' statements
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinFrameworkBundle.properties b/idea/resources/messages/KotlinFrameworkBundle.properties
deleted file mode 100644
index 2b7cf041066..00000000000
--- a/idea/resources/messages/KotlinFrameworkBundle.properties
+++ /dev/null
@@ -1 +0,0 @@
-name.kotlin.sdk=Kotlin SDK
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinHierarchyBundle.properties b/idea/resources/messages/KotlinHierarchyBundle.properties
deleted file mode 100644
index 6c6e59881ca..00000000000
--- a/idea/resources/messages/KotlinHierarchyBundle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-text.anonymous=[anonymous]
-text.in=\ in {0}
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinHighlighterBundle.properties b/idea/resources/messages/KotlinHighlighterBundle.properties
deleted file mode 100644
index c2ebf98f0e0..00000000000
--- a/idea/resources/messages/KotlinHighlighterBundle.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-action.text.go.to.actual.declarations=Go to actual declarations
-action.text.go.to.expected.declaration=Go to expected declaration
-action.text.go.to.implementations=Go to implementations
-action.text.go.to.overridden.methods=Go to overridden methods
-action.text.go.to.overridden.properties=Go to overridden properties
-action.text.go.to.subclasses=Go to subclasses
-action.text.go.to.super.method=Go to super method
-action.text.go.to.super.property=Go to super property
-description.text.android.extensions.property=Properties and Variables//Android Extensions synthetic properties
-description.text.annotation=Annotation
-description.text.arrow=Braces and Operators//Arrow
-description.text.builtin.annotation=Keywords//Modifier
-description.text.builtin.keyword.val=Keywords//'val'
-description.text.builtin.keyword.var=Keywords//'var'
-description.text.builtin.keyword=Keywords//Keyword
-description.text.captured.variable=Properties and Variables//Variables and values captured in a closure
-description.text.closure.braces=Braces and Operators//Lambda expression braces and arrow
-description.text.colon=Braces and Operators//Colon
-description.text.constructor.call=Functions//Constructor call
-description.text.double.colon=Braces and Operators//Double colon
-description.text.dynamic.fun.call=Functions//Dynamic function call
-description.text.dynamic.property=Properties and Variables//Dynamic property
-description.text.enumEntry=Classes and Interfaces//Enum entry
-description.text.exclexcl=Braces and Operators//Non-null assertion
-description.text.extension.fun.call=Functions//Extension function call
-description.text.extension.property=Properties and Variables//Extension property
-description.text.field=Properties and Variables//Backing field variable
-description.text.fun.call=Functions//Function call
-description.text.fun=Functions//Function declaration
-description.text.instance.property.custom.property.declaration=Properties and Variables//Instance property with custom property declarations
-description.text.instance.property=Properties and Variables//Instance property
-description.text.it=Parameters//Lambda expression default parameter
-description.text.kdoc.comment=Comments//KDoc//KDoc comment
-description.text.kdoc.tag=Comments//KDoc//KDoc tag
-description.text.kdoc.value=Comments//KDoc//Link in KDoc tag
-description.text.label=Label
-description.text.local.variable=Properties and Variables//Local variable or value
-description.text.named.argument=Named argument
-description.text.object=Classes and Interfaces//Object
-description.text.package.fun.call=Functions//Package-level function call
-description.text.package.property.custom.property.declaration=Properties and Variables//Package-level property with custom property declarations
-description.text.package.property=Properties and Variables//Package-level property
-description.text.quest=Braces and Operators//Type nullability marker
-description.text.safe.access=Braces and Operators//Safe access dot
-description.text.smart.cast.receiver=Smart-casts//Smart-cast implicit receiver
-description.text.smart.cast=Smart-casts//Smart-cast value
-description.text.smart.constant=Smart-casts//Smart constant
-description.text.string.escape=String//Escape in string and template braces
-description.text.suspend.fun.call=Functions//Suspend function call
-description.text.synthetic.extension.property=Properties and Variables//Synthetic extension property
-description.text.typeAlias=Classes and Interfaces//Type alias
-description.text.var=Properties and Variables//Var (mutable variable, parameter or property)
-description.text.variable.as.function.call=Properties and Variables//Variable as function call
-description.text.variable.as.function.like.call=Properties and Variables//Variable as function-like call
-message.suspend.function.call=Suspend function call
-message.suspending.iteration=Suspending iteration
-name.dsl.markers=DSL markers
-name.dsl=Dsl//
-name.implemented.declaration=Implemented declaration
-name.implementing.declaration=Implementing declaration
-name.kotlin.line.markers=Kotlin line markers
-name.multiplatform.actual.declaration=Multiplatform actual declaration
-name.multiplatform.expect.declaration=Multiplatform expect declaration
-name.overridden.declaration=Overridden declaration
-name.overriding.declaration=Overriding declaration
-name.style=Style
-notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update=Navigation to overriding classes is not possible during index update
-prefix.text.has.actuals.in=Has actuals in
-text.click.for.navigate=Click {0}to navigate
-text.has.functional.implementations=Has functional implementations
-text.implements=Implements
-text.in={0} in '{1}'
-text.modules=\ ({0} modules)
-text.or.press=\ or press {0}
-text.overrides=Overrides
-title.actuals.for=Actuals for {0}
-title.choose.actual.for=Choose actual for {0}
-title.choose.expected.for=Choose expected for {0}
-title.expected.for=Expected for {0}
-title.overriding.declarations.of=Overriding declarations of {0}
-title.searching.for.overriding.declarations=Searching for overriding declarations
-title.searching.for.overriding.methods=Searching for overriding methods
-tool.tip.has.declaration.in.common.module=Has declaration in common module
-tool.tip.marker.annotation.for.dsl=Marker annotation for DSL
-tool.tip.text.function=function
-tool.tip.text.property=property
-tool.tip.text.recursive.call=Recursive call
-tool.tip.text.run.test=Run Test
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinImportsBundle.properties b/idea/resources/messages/KotlinImportsBundle.properties
deleted file mode 100644
index cbabe970711..00000000000
--- a/idea/resources/messages/KotlinImportsBundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-notification.text.unused.imports.not.found=Unused imports not found
-progress.indicator.text.collect.imports.for=Collect imports for {0}
-text.import.optimizer.import={0, choice, 0#import|2#imports}
-text.import.optimizer.non.zero=Removed {0} {1}{2, choice, 0#|1#, added {2} {3}}
-text.import.optimizer.zero=Rearranged imports
diff --git a/idea/resources/messages/KotlinInternalBundle.properties b/idea/resources/messages/KotlinInternalBundle.properties
deleted file mode 100644
index e96fa8651d9..00000000000
--- a/idea/resources/messages/KotlinInternalBundle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-action.text.decompile.kotlin.bytecode=Decompile kotlin bytecode
-error.text.cannot.decompile=Cannot decompile {0}
-indicator.text.decompiling=Decompiling {0}
-title.decompiler.error=Decompiler error
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinRefactoringBundle.properties b/idea/resources/messages/KotlinRefactoringBundle.properties
deleted file mode 100644
index 3677f0a4c44..00000000000
--- a/idea/resources/messages/KotlinRefactoringBundle.properties
+++ /dev/null
@@ -1,174 +0,0 @@
-0.1.is.never.used={0} ''{1}'' is never used
-0.has.detected.1.code.fragments.in.2.that.can.be.replaced.with.3={0} has detected {1} code {1,choice,1#fragment|2#fragments} in {2} that can be replaced with {3}. Would you like to review and replace {1,choice,1#it|2#them}?
-0.usages.are.not.supported.by.the.inline.refactoring.they.won.t.be.processed={0} usages are not supported by the Inline refactoring. They won''t be processed.
-0.will.become.invisible.after.extraction={0} will become invisible after extraction
-0.will.no.longer.be.accessible.after.extraction={0} will no longer be accessible after extraction
-action.text.append=Append
-action.text.cancel=Cancel
-action.text.overwrite=Overwrite
-cannot.extract.method=Cannot find statements to extract
-cannot.extract.super.call=Cannot extract super-call
-cannot.inline.property.with.accessor.s.and.backing.field=Cannot inline property with accessor(s) and backing field
-cannot.introduce.parameter.of.0.type=Cannot introduce parameter of type ''{0}''
-cannot.refactor.expression.has.unit.type=Cannot introduce expression of unit type
-cannot.refactor.no.container=Cannot refactor in this place
-cannot.refactor.no.expression=Cannot perform refactoring without an expression
-cannot.refactor.no.type=Cannot perform refactoring without a type
-cannot.refactor.not.expression.to.extract=Cannot find an expression to extract
-cannot.refactor.not.expression=Cannot find an expression to introduce
-cannot.refactor.package.expression=Cannot introduce package reference
-cannot.refactor.syntax.errors=Cannot refactor due to erroneous code
-cannot.refactor.synthesized.function=Cannot refactor synthesized function ''{0}''
-checkbox.text.declare.with.var=Declare with &var
-checkbox.text.extension.property=E&xtension property:\u0020
-checkbox.text.introduce.default.value=Introduce &default value
-checkbox.text.replace.all.occurrences.0=&Replace all occurrences ({0})
-checkbox.text.specify.type.explicitly=Specify &type explicitly
-column.name.receiver=Receiver:
-column.name.val.var=Val/Var
-declarations.are.used.outside.of.selected.code.fragment=Following declarations are used outside of selected code fragment:
-declarations.will.move.out.of.scope=Following declarations won't be available outside of extracted function body:
-description.a.reference.to.extracted.type.parameter=a reference to extracted type parameter
-error.cant.refactor.vararg.functions=Can't refactor the function with variable arguments
-error.hint.text.cannot.inline.0.from.a.decompiled.file=Cannot inline ''{0}'' from a decompiled file
-error.text.can.t.change.signature.of.method=Can''t change signature of {0} method
-error.text.can.t.copy.class.to.the.containing.file=Can''t copy class to the containing file
-error.text.can.t.generate.0.1=Can''t generate {0}: {1}
-error.text.can.t.introduce.lambda.parameter.for.this.expression=Can''t introduce lambda parameter for this expression
-error.text.can.t.introduce.property.for.this.expression=Can''t introduce property for this expression
-error.text.different.name.expected=Different name expected
-error.text.expression.has.no.type=Expression has no type
-error.text.extraction.from.expect.class.is.not.yet.supported=Extraction from expect class is not yet supported
-error.text.extraction.from.non.jvm.class.is.not.yet.supported=Extraction from non-JVM class is not yet supported
-error.text.inline.function.is.not.supported.for.functions.with.multiple.return.statements=Inline Function is not supported for functions with multiple return statements.
-error.text.inline.function.is.not.supported.for.functions.with.return.statements.not.at.the.end.of.the.body=Inline Function is not supported for functions with return statements not at the end of the body.
-error.text.interface.cannot.be.extracted.from.an.annotation.class=Interface cannot be extracted from an annotation class
-error.text.introduce.parameter.is.not.available.for.default.value=Introduce Parameter is not available for default value
-error.text.introduce.parameter.is.not.available.inside.of.annotation.entries=Introduce Parameter is not available inside of annotation entries
-error.text.invalid.default.receiver.value=Invalid default receiver value
-error.text.invalid.name=Invalid name
-error.text.invalid.parameter.name=Invalid parameter name
-error.text.invalid.parameter.type=Invalid parameter type
-error.text.invalid.receiver.type=Invalid receiver type
-error.text.invalid.return.type=Invalid return type
-error.text.no.type.to.refactor=No type to refactor
-error.text.refactoring.is.not.applicable.in.the.current.context=Refactoring is not applicable in the current context
-error.text.superclass.cannot.be.extracted.from.an.annotation.class=Superclass cannot be extracted from an annotation class
-error.text.type.reference.is.expected=Type reference is expected
-error.types.in.generated.function=Cannot generate function with erroneous return type
-error.wrong.caret.position.function.or.constructor.name=The caret should be positioned at the name of the function or constructor to be refactored.
-extract.function=Extract Function
-family.name.update.usages.on.declarations.cut.paste=Update usages on declarations cut/paste
-file.does.not.exist=File {0} does not exist.\nDo you want to create it?
-function.name.is.invalid=Function name is invalid
-introduce.parameter=Introduce Parameter
-introduce.property=Introduce Property
-introduce.type.parameter.to.declaration=Introduce type parameter to declaration
-introduce.type.parameter=Introduce Type Parameter
-introduce.variable=Introduce Variable
-label.text.default.receiver.value=&Default receiver value:\u0020
-label.text.introduce.as=&Introduce as:\u0020
-label.text.name=&Name:\u0020
-label.text.receiver.type=Receiver &type:\u0020
-label.text.target.file.name=Target file name:
-label.text.type=&Type:\u0020
-label.text.visibility=&Visibility:\u0020
-message.change.signature.is.not.applicable.to.dynamically.invoked.functions=Change signature is not applicable to dynamically invoked functions
-message.do.not.show.for.local.variables.in.future=Do not show for local variables in future
-message.text.return.type.cannot.be.resolved=Return type ''{0}'' cannot be resolved.\nContinue?
-message.text.type.alias.0.is.never.used=Type alias ''{0}'' is never used
-message.type.for.cannot.be.resolved=Type ''{0}'' for {1} cannot be resolved.\nContinue?
-name.extract.interface=Extract Interface
-name.inline.type.alias=Inline Type Alias
-name.introduce.import.alias=Introduce Import Alias
-name.introduce.lambda.parameter=Introduce Lambda Parameter
-name.introduce.parameter1=Introduce Parameter
-name.introduce.type.alias=Introduce Type Alias
-name.kdoc.for.abstracts=KDoc for abstracts
-naming.convention.will.be.violated.after.rename=Naming conventions will be violated after rename
-non.kotlin.usage.0=Non-Kotlin usage: {0}
-parameter.name.is.invalid=Parameter name ''{0}'' is invalid
-parameter.type.is.invalid=Parameter type ''{0}'' is invalid
-parameter.types.are.not.denotable=Cannot extract method since following types are not denotable in the target scope:
-refactoring.move.non.kotlin.file=Target must be a Kotlin file
-return.type.is.invalid=Return type is invalid
-searching.usages.of.0.parameter=Searching usages of ''{0}''parameter
-selected.code.fragment.has.multiple.exit.points=Selected code fragment has multiple exit points
-selected.code.fragment.has.multiple.output.values=Selected code fragment has more than 3 output values:
-selected.code.fragment.has.output.values.and.exit.points=Selected code fragment has output values as well as alternative exit points
-setter.of.0.will.become.invisible.after.extraction = Setter of {0} will become invisible after extraction
-text.0.is.not.allowed.in.the.target.context=''{0}'' is not allowed in the target context
-text.0.to.inline={0} to inline
-text.0.will.no.longer.be.accessible.after.signature.change={0} will no longer be accessible after signature change
-text.all=All
-text.anonymous=[Anonymous]
-text.callee.text.would.be.shown.here=Callee text would be shown here
-text.caller.text.with.highlighted.callee.call.would.be.shown.here=Caller text\nwith highlighted callee call would be shown here
-text.cannot.inline.0.1.usages=Cannot inline {0}/{1} usages
-text.class.0.already.exists.in.the.target.scope=Class {0} already exists in the target scope 
-text.constructor=constructor
-text.create.destructuring.declaration=Create destructuring declaration
-text.create.single.variable=Create single variable
-text.declaration=declaration
-text.default.value=\ // default value = {0}
-text.duplicating.local.variable=Duplicating local variable ''{0}''
-text.duplicating.parameter=Duplicating parameter ''{0}''
-text.duplicating.property=Duplicating property ''{0}''
-text.explicit.receiver.is.already.present.in.call.element.0=Explicit receiver is already present in call element: {0}
-text.extract.superclass=Extract Superclass
-text.file.0.already.exists.in.1=File {0} already exists in {1}
-text.function.already.exists=Function already exists: ''{0}''
-text.function=function
-text.inline.0.1.2=Inline {0} ''{1}''? {2}
-text.inline.0=Inline {0}
-text.inline.all.references.and.0.the.1=Inline all references and {0} the kind {1}
-text.inline.recursive.function.is.supported.only.on.references=Inline recursive function is supported only on references
-text.inline.this.reference.and.keep.the.0=Inline this reference and keep the {0}
-text.inlining.0.1=Inlining {0} {1} 
-text.introduce.default.value=Intro&duce default value
-text.keep=keep
-text.lambda.parameter=lambda parameter
-text.lambda.parameters=Lambda &parameters:\u0020
-text.lambda.return.type=Lambda return &type
-text.lazy.property=lazy property
-text.local.property=property
-text.local.variable=local variable
-text.name=Name
-text.no.name.provided.for.type.alias=No name provided for type alias
-text.parameter.0=parameter ''{0}''
-text.parameter.name=Parameter &name:\u0020
-text.parameter.reference.can.t.be.safely.replaced.with.0.since.1.is.ambiguous.in.this.context=Parameter reference can''t be safely replaced with {0} since {1} is ambiguous in this context
-text.parameter.reference.can.t.be.safely.replaced.with.0.since.target.function.can.t.be.referenced.in.this.context=Parameter reference can''t be safely replaced with {0} since target function can''t be referenced in this context
-text.parameter.type=Parameter &type:\u0020
-text.parameter=parameter ''{0}''
-text.parameters=&Parameters
-text.proceed.with.extraction=Proceed with extraction
-text.process.duplicates=Process Duplicates
-text.property.with.getter=property with getter
-text.property.with.initializer=property with initializer
-text.property=property
-text.receiver.can.t.be.safely.transformed.to.value.argument=Receiver can''t be safely transformed to value argument: {0}
-text.receiver=receiver
-text.refactoring.can.t.be.performed.on.the.selected.code.element=Refactoring can''t be performed on the selected code element
-text.refactoring.is.not.applicable.to.this.code.fragment=Refactoring is not applicable to this code fragment
-text.remove.0.no.longer.used=Remove {0} no longer used
-text.remove=remove
-text.select.target.code.block.file=Select target code block / file
-text.select.target.code.block=Select target code block
-text.select.target.file=Select target file
-text.the.following=The following
-text.there.is.already.a.parameter=There is already a parameter ''{0}'' in {1}. It will conflict with the new parameter.
-text.there.is.already.a.variable.0.in.1.it.will.conflict.with.the.new.parameter=There is already a variable ''{0}'' in {1}. It will conflict with the new parameter.
-text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined=Type alias cannot refer to types which aren''t accessible in the scope where it''s defined
-text.type.alias.name.must.be.a.valid.identifier.0=Type alias name must be a valid identifier: {0}
-text.type.alias=type alias
-text.type.already.exists.in.the.target.scope=Type {0} already exists in the target scope
-text.type.parameter.names.must.be.distinct=Type parameter names must be distinct
-text.type.parameters=Type &Parameters
-text.type=Type
-text.update.usages.to.reflect.declaration.0.move=Update usages to reflect {0, choice, 0#declaration|1#declarations} move
-text.variable=variable
-title.inline.function=Inline Function
-title.introduce.parameter.to.declaration=Introduce parameter to declaration
-title.select.target.code.block=Select target code block
-unsupported.usage.0=Unsupported usage: {0}
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinReporterBundle.properties b/idea/resources/messages/KotlinReporterBundle.properties
deleted file mode 100644
index 5498dc367bd..00000000000
--- a/idea/resources/messages/KotlinReporterBundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-button.text.ignore=Ignore
-button.text.update=Update
-message.text.you.re.running.kotlin.plugin.version=You''re running Kotlin plugin version {0}, while the latest version is {1}
-text.can.t.report.exception.from.patched.plugin=Can''t report exception from patched plugin
-title.update.kotlin.plugin=Update Kotlin Plugin
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinRootsBundle.properties b/idea/resources/messages/KotlinRootsBundle.properties
deleted file mode 100644
index 427d2fa77e7..00000000000
--- a/idea/resources/messages/KotlinRootsBundle.properties
+++ /dev/null
@@ -1 +0,0 @@
-description.text.update.source.roots.for.non.jvm.modules.in.kotlin.project=Update source roots for non-JVM modules in Kotlin project
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinScriptBundle.properties b/idea/resources/messages/KotlinScriptBundle.properties
deleted file mode 100644
index 4a8e529c62c..00000000000
--- a/idea/resources/messages/KotlinScriptBundle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-action.text.ignore=Ignore
-action.text.open.settings=Open Settings
-action.text.show.all=Show all
-name.kotlin.scripting=Kotlin Scripting
-progress.text.kotlin.scanning.dependencies.for.script.definitions=Kotlin: scanning dependencies for script definitions...
-text.multiple.script.definitions.are.applicable.for.this.script=Multiple script definitions are applicable for this script. {0} is used
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinSlicerBundle.properties b/idea/resources/messages/KotlinSlicerBundle.properties
deleted file mode 100644
index b9680644d01..00000000000
--- a/idea/resources/messages/KotlinSlicerBundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-text.in=\ in {0}
-text.tracking.enclosing.lambda=\ (Tracking enclosing lambda)
-title.dataflow.from.here=Dataflow from Here
-title.dataflow.to.here=Dataflow to Here
-tool.tip.text.variable.dereferenced=Variable dereferenced
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinTestIntegrationBundle.properties b/idea/resources/messages/KotlinTestIntegrationBundle.properties
deleted file mode 100644
index 74367abe6e3..00000000000
--- a/idea/resources/messages/KotlinTestIntegrationBundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-button.text.cancel=Cancel
-button.text.rewrite=Rewrite
-message.text.create.test.in.the.same.source.root=Create test in the same source root?
-message.text.kotlin.class=Kotlin class ''{0}'' already exists. Do you want to update it?
-title.no.test.roots.found=No Test Roots Found
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinUpdateBundle.properties b/idea/resources/messages/KotlinUpdateBundle.properties
deleted file mode 100644
index 853bf716c2e..00000000000
--- a/idea/resources/messages/KotlinUpdateBundle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name.android.studio=Android Studio
-reason.text.exception.during.verification=exception during verification {0}
-reason.text.no.verified.versions.for.this.build=No verified versions for this build.
-reason.text.unable.to.connect.to.compatibility.verification.repository=unable to connect to compatibility verification repository
-reason.text.unable.to.parse.compatibility.verification.metadata=unable to parse compatibility verification metadata
-reason.text.version.to.be.verified=Version to be verified.
\ No newline at end of file
diff --git a/idea/resources/messages/KotlinVersionBundle.properties b/idea/resources/messages/KotlinVersionBundle.properties
deleted file mode 100644
index 70b8234c20c..00000000000
--- a/idea/resources/messages/KotlinVersionBundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-title.no.runtime.found=No Runtime Found
-dialog.message.is.not.found.make.sure.plugin.is.properly.installed={0} is not found. Make sure plugin is properly installed.
-message.is.deprecated.since.1.2.0.and.should.be.replaced.with={0} is deprecated since 1.2.0 and should be replaced with {1}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index 07211d56f2c..f262a2a418d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
 import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants;
 import org.jetbrains.kotlin.config.*;
 import org.jetbrains.kotlin.idea.PluginStartupService;
-import org.jetbrains.kotlin.idea.configuration.KotlinConfigurationBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer;
 import org.jetbrains.kotlin.idea.facet.KotlinFacet;
 import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent;
@@ -60,19 +60,14 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
     private static final int MAX_WARNING_SIZE = 75;
 
     static {
-        moduleKindDescriptions
-                .put(K2JsArgumentConstants.MODULE_PLAIN, KotlinConfigurationBundle.message("description.plain.put.to.global.scope"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_AMD, KotlinConfigurationBundle.message("description.amd"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_COMMONJS, KotlinConfigurationBundle.message("description.commonjs"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_UMD, KotlinConfigurationBundle
-                .message("description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_PLAIN, KotlinBundle.message("configuration.description.plain.put.to.global.scope"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_AMD, KotlinBundle.message("configuration.description.amd"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_COMMONJS, KotlinBundle.message("configuration.description.commonjs"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_UMD, KotlinBundle.message("configuration.description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain"));
 
-        soruceMapSourceEmbeddingDescriptions
-                .put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_NEVER, KotlinConfigurationBundle.message("description.never"));
-        soruceMapSourceEmbeddingDescriptions
-                .put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_ALWAYS, KotlinConfigurationBundle.message("description.always"));
-        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_INLINING, KotlinConfigurationBundle
-                .message("description.when.inlining.a.function.from.other.module.with.embedded.sources"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_NEVER, KotlinBundle.message("configuration.description.never"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_ALWAYS, KotlinBundle.message("configuration.description.always"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_INLINING, KotlinBundle.message("configuration.description.when.inlining.a.function.from.other.module.with.embedded.sources"));
     }
 
     @Nullable
@@ -191,13 +186,13 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
 
     private void initializeNonCidrSettings(boolean isMultiEditor) {
         setupFileChooser(labelForOutputPrefixFile, outputPrefixFile,
-                         KotlinConfigurationBundle.message("title.kotlin.compiler.js.option.output.prefix.browse.title"),
+                         KotlinBundle.message("configuration.title.kotlin.compiler.js.option.output.prefix.browse.title"),
                          true);
         setupFileChooser(labelForOutputPostfixFile, outputPostfixFile,
-                         KotlinConfigurationBundle.message("title.kotlin.compiler.js.option.output.postfix.browse.title"),
+                         KotlinBundle.message("configuration.title.kotlin.compiler.js.option.output.postfix.browse.title"),
                          true);
         setupFileChooser(labelForOutputDirectory, outputDirectory,
-                         KotlinConfigurationBundle.message("title.choose.output.directory"),
+                         KotlinBundle.message("configuration.title.choose.output.directory"),
                          false);
 
         fillModuleKindList();
@@ -235,12 +230,12 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
         int nameCountToShow = calculateNameCountToShowInWarning(modulesOverridingProjectSettings);
         int allNamesCount = modulesOverridingProjectSettings.size();
         if (nameCountToShow == 0) {
-            return KotlinConfigurationBundle.message("warning.text.modules.override.project.settings", String.valueOf(allNamesCount));
+            return KotlinBundle.message("configuration.warning.text.modules.override.project.settings", String.valueOf(allNamesCount));
         }
 
         StringBuilder builder = new StringBuilder();
         builder.append("<html>");
-        builder.append(KotlinConfigurationBundle.message("warning.text.following.modules.override.project.settings")).append(" ");
+        builder.append(KotlinBundle.message("configuration.warning.text.following.modules.override.project.settings")).append(" ");
         CollectionsKt.joinTo(
                 modulesOverridingProjectSettings.subList(0, nameCountToShow),
                 builder,
@@ -257,8 +252,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
                 }
         );
         if (nameCountToShow < allNamesCount) {
-            builder.append(" ").append(KotlinConfigurationBundle.message("text.and")).append(" ").append(allNamesCount - nameCountToShow)
-                    .append(" ").append(KotlinConfigurationBundle.message("text.other.s"));
+            builder.append(" ").append(KotlinBundle.message("configuration.text.and")).append(" ").append(allNamesCount - nameCountToShow).append(" ").append(KotlinBundle.message("configuration.text.other.s"));
         }
         return builder.toString();
     }
@@ -636,7 +630,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
     @Nls
     @Override
     public String getDisplayName() {
-        return KotlinConfigurationBundle.message("name.kotlin.compiler");
+        return KotlinBundle.message("configuration.name.kotlin.compiler");
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192 b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192
index 4b7f6d456d8..623982ef608 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java.192
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants;
 import org.jetbrains.kotlin.config.*;
 import org.jetbrains.kotlin.idea.PluginStartupComponent;
 import org.jetbrains.kotlin.idea.configuration.ProjectUtilsKt;
-import org.jetbrains.kotlin.idea.configuration.KotlinConfigurationBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.facet.DescriptionListCellRenderer;
 import org.jetbrains.kotlin.idea.facet.KotlinFacet;
 import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent;
@@ -63,14 +63,14 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
     private static final int MAX_WARNING_SIZE = 75;
 
     static {
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_PLAIN, KotlinConfigurationBundle.message("description.plain.put.to.global.scope"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_AMD, KotlinConfigurationBundle.message("description.amd"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_COMMONJS, KotlinConfigurationBundle.message("description.commonjs"));
-        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_UMD, KotlinConfigurationBundle.message("description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_PLAIN, KotlinBundle.message("configuration.description.plain.put.to.global.scope"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_AMD, KotlinBundle.message("configuration.description.amd"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_COMMONJS, KotlinBundle.message("configuration.description.commonjs"));
+        moduleKindDescriptions.put(K2JsArgumentConstants.MODULE_UMD, KotlinBundle.message("configuration.description.umd.detect.amd.or.commonjs.if.available.fallback.to.plain"));
 
-        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_NEVER, KotlinConfigurationBundle.message("description.never"));
-        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_ALWAYS, KotlinConfigurationBundle.message("description.always"));
-        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_INLINING, KotlinConfigurationBundle.message("description.when.inlining.a.function.from.other.module.with.embedded.sources"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_NEVER, KotlinBundle.message("configuration.description.never"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_ALWAYS, KotlinBundle.message("configuration.description.always"));
+        soruceMapSourceEmbeddingDescriptions.put(K2JsArgumentConstants.SOURCE_MAP_SOURCE_CONTENT_INLINING, KotlinBundle.message("configuration.description.when.inlining.a.function.from.other.module.with.embedded.sources"));
     }
 
     @Nullable
@@ -189,13 +189,13 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
 
     private void initializeNonCidrSettings(boolean isMultiEditor) {
         setupFileChooser(labelForOutputPrefixFile, outputPrefixFile,
-                         KotlinConfigurationBundle.message("title.kotlin.compiler.js.option.output.prefix.browse.title"),
+                         KotlinBundle.message("configuration.title.kotlin.compiler.js.option.output.prefix.browse.title"),
                          true);
         setupFileChooser(labelForOutputPostfixFile, outputPostfixFile,
-                         KotlinConfigurationBundle.message("title.kotlin.compiler.js.option.output.postfix.browse.title"),
+                         KotlinBundle.message("configuration.title.kotlin.compiler.js.option.output.postfix.browse.title"),
                          true);
         setupFileChooser(labelForOutputDirectory, outputDirectory,
-                         KotlinConfigurationBundle.message("title.choose.output.directory"),
+                         KotlinBundle.message("configuration.title.choose.output.directory"),
                          false);
 
         fillModuleKindList();
@@ -233,12 +233,12 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
         int nameCountToShow = calculateNameCountToShowInWarning(modulesOverridingProjectSettings);
         int allNamesCount = modulesOverridingProjectSettings.size();
         if (nameCountToShow == 0) {
-            return KotlinConfigurationBundle.message("warning.text.modules.override.project.settings", String.valueOf(allNamesCount));
+            return KotlinBundle.message("configuration.warning.text.modules.override.project.settings", String.valueOf(allNamesCount));
         }
 
         StringBuilder builder = new StringBuilder();
         builder.append("<html>");
-        builder.append(KotlinConfigurationBundle.message("warning.text.following.modules.override.project.settings")).append(" ");
+        builder.append(KotlinBundle.message("configuration.warning.text.following.modules.override.project.settings")).append(" ");
         CollectionsKt.joinTo(
                 modulesOverridingProjectSettings.subList(0, nameCountToShow),
                 builder,
@@ -255,7 +255,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
                 }
         );
         if (nameCountToShow < allNamesCount) {
-            builder.append(" ").append(KotlinConfigurationBundle.message("text.and")).append(" ").append(allNamesCount - nameCountToShow).append(" ").append(KotlinConfigurationBundle.message("text.other.s"));
+            builder.append(" ").append(KotlinBundle.message("configuration.text.and")).append(" ").append(allNamesCount - nameCountToShow).append(" ").append(KotlinBundle.message("configuration.text.other.s"));
         }
         return builder.toString();
     }
@@ -628,7 +628,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
     @Nls
     @Override
     public String getDisplayName() {
-        return KotlinConfigurationBundle.message("name.kotlin.compiler");
+        return KotlinBundle.message("configuration.name.kotlin.compiler");
     }
 
     @Nullable
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
index 19f4c130714..accbb4c8777 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt
@@ -20,13 +20,13 @@ import javax.swing.JPanel
 
 object ExperimentalFeatures {
     val NewJ2k = RegistryExperimentalFeature(
-        title = KotlinConfigurationBundle.message("feature.text.new.java.to.kotlin.converter"),
+        title = KotlinBundle.message("configuration.feature.text.new.java.to.kotlin.converter"),
         registryKey = "kotlin.experimental.new.j2k",
         enabledByDefault = true
     )
 
     val NewWizard = object : RegistryExperimentalFeature(
-        title = KotlinConfigurationBundle.message("feature.text.new.experimental.project.wizard"),
+        title = KotlinBundle.message("configuration.feature.text.new.experimental.project.wizard"),
         registryKey = "kotlin.experimental.project.wizard",
         enabledByDefault = false
     ) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
deleted file mode 100644
index a16f2a3779d..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinConfigurationBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.configuration
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinConfigurationBundle"
-
-object KotlinConfigurationBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
index f304a85a8c6..9094732c011 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
@@ -9,6 +9,7 @@ import com.intellij.ide.IdeBundle
 import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.options.SearchableConfigurable
 import com.intellij.openapi.updateSettings.impl.UpdateSettings
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinPluginUpdater
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.PluginUpdateStatus
@@ -28,20 +29,20 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
 
             UpdateChannel.values().find { it.ordinal == channelOrdinal }?.let { eapChannel ->
                 if (eapChannel != UpdateChannel.STABLE) {
-                    hosts.add(eapChannel.url ?: error(KotlinConfigurationBundle.message("error.text.shouldn.t.add.null.urls.to.custom.repositories")))
+                    hosts.add(eapChannel.url ?: error(KotlinBundle.message("configuration.error.text.shouldn.t.add.null.urls.to.custom.repositories")))
                 }
             }
         }
 
         enum class UpdateChannel(val url: String?, val title: String) {
-            STABLE(null, KotlinConfigurationBundle.message("title.stable")),
+            STABLE(null, KotlinBundle.message("configuration.title.stable")),
             EAP(
                 "https://plugins.jetbrains.com/plugins/eap/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}",
-                KotlinConfigurationBundle.message("title.early.access.preview.1.3.x")
+                KotlinBundle.message("configuration.title.early.access.preview.1.3.x")
             ),
             EAP_NEXT(
                 "https://plugins.jetbrains.com/plugins/eap-next/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}",
-                KotlinConfigurationBundle.message("title.early.access.preview.1.4.x")
+                KotlinBundle.message("configuration.title.early.access.preview.1.4.x")
             );
 
             fun isInHosts(): Boolean {
@@ -63,7 +64,7 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
 
     override fun getId(): String = ID
 
-    override fun getDisplayName(): String = KotlinConfigurationBundle.message("name.kotlin")
+    override fun getDisplayName(): String = KotlinBundle.message("configuration.name.kotlin")
 
     override fun isModified() =
         form.experimentalFeaturesPanel.isModified()
@@ -92,7 +93,7 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
             update?.let {
                 form.hideInstallButton()
 
-                setInstalledVersion(it.pluginDescriptor.version, KotlinConfigurationBundle.message("status.text.installing"))
+                setInstalledVersion(it.pluginDescriptor.version, KotlinBundle.message("configuration.status.text.installing"))
 
                 form.installStatusLabel.text = installingStatus
 
@@ -114,7 +115,7 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
                     },
                     errorCallback = {
                         if (versionForInstallation == it.pluginDescriptor.version) {
-                            form.installStatusLabel.text = KotlinConfigurationBundle.message("status.text.installation.failed")
+                            form.installStatusLabel.text = KotlinBundle.message("configuration.status.text.installation.failed")
                             form.showInstallButton()
                             setInstalledVersion(null, null)
                         }
@@ -153,7 +154,7 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
             when (pluginUpdateStatus) {
                 PluginUpdateStatus.LatestVersionInstalled -> {
                     form.setUpdateStatus(
-                        KotlinConfigurationBundle.message("message.text.you.have.the.latest.version.of.the.plugin.installed"),
+                        KotlinBundle.message("configuration.message.text.you.have.the.latest.version.of.the.plugin.installed"),
                         false
                     )
                 }
@@ -162,8 +163,7 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
                     update = pluginUpdateStatus
                     versionForInstallation = update?.pluginDescriptor?.version
                     form.setUpdateStatus(
-                        KotlinConfigurationBundle.message(
-                            "message.text.a.new.version.is.available",
+                        KotlinBundle.message("configuration.message.text.a.new.version.is.available",
                             pluginUpdateStatus.pluginDescriptor.version
                         ),
                         true
@@ -177,14 +177,13 @@ class KotlinLanguageConfiguration : SearchableConfigurable, Configurable.NoScrol
 
                 is PluginUpdateStatus.CheckFailed ->
                     form.setUpdateStatus(
-                        KotlinConfigurationBundle.message("message.text.update.check.failed", pluginUpdateStatus.message),
+                        KotlinBundle.message("configuration.message.text.update.check.failed", pluginUpdateStatus.message),
                         false
                     )
 
                 is PluginUpdateStatus.Unverified -> {
                     val version = pluginUpdateStatus.updateStatus.pluginDescriptor.version
-                    val generalLine = KotlinConfigurationBundle.message(
-                        "message.text.a.new.version.is.found",
+                    val generalLine = KotlinBundle.message("configuration.message.text.a.new.version.is.found",
                         version,
                         pluginUpdateStatus.verifierName
                     )
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/outdatedBundledCompilerNotification.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/outdatedBundledCompilerNotification.kt
index 3180da9c8ab..01501bc13a2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/outdatedBundledCompilerNotification.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/outdatedBundledCompilerNotification.kt
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.util.text.VersionComparatorUtil
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesAction
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
@@ -46,7 +47,7 @@ fun notifyOutdatedBundledCompilerIfNecessary(project: Project) {
     Notifications.Bus.notify(
         Notification(
             OUTDATED_BUNDLED_COMPILER_GROUP_DISPLAY_ID,
-            KotlinConfigurationBundle.message("title.outdated.bundled.kotlin.compiler"),
+            KotlinBundle.message("configuration.title.outdated.bundled.kotlin.compiler"),
             message,
             NotificationType.WARNING,
             NotificationListener { notification, event ->
@@ -130,10 +131,10 @@ fun createOutdatedBundledCompilerMessage(project: Project, bundledCompilerVersio
     modulesStr = modulesStr.removeSuffix("<br/>")
 
     return """
-        <p>${KotlinConfigurationBundle.message("text.the.compiler.bundled.to.kotlin.plugin", bundledCompilerVersion)}</p>
+        <p>${KotlinBundle.message("configuration.text.the.compiler.bundled.to.kotlin.plugin", bundledCompilerVersion)}</p>
         <ul>$modulesStr</ul>
-        <p>${KotlinConfigurationBundle.message("text.this.may.cause.different.set.of.errors.and.warnings.reported.in.ide.p")}</p>
-        <p><a href="update">${KotlinConfigurationBundle.message("action.text.update")}</a>  <a href="ignore">${KotlinConfigurationBundle.message("action.text.ignore")}</a></p>"""
+        <p>${KotlinBundle.message("configuration.text.this.may.cause.different.set.of.errors.and.warnings.reported.in.ide.p")}</p>
+        <p><a href="update">${KotlinBundle.message("configuration.action.text.update")}</a>  <a href="ignore">${KotlinBundle.message("configuration.action.text.ignore")}</a></p>"""
         .trimIndent().lines().joinToString(separator = "").replace("<br/>", "\n")
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java
index 64f1597836c..cf45064d554 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.java
@@ -11,7 +11,7 @@ import com.intellij.util.ui.AsyncProcessIcon;
 import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.PlatformVersion;
 import org.jetbrains.kotlin.idea.configuration.ExperimentalFeaturesPanel;
-import org.jetbrains.kotlin.idea.configuration.KotlinConfigurationBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.util.VersioningKt;
 
 import javax.swing.*;
@@ -41,7 +41,7 @@ public class KotlinLanguageConfigurationForm {
         if (KotlinPluginUtil.isPatched()) {
             @SuppressWarnings("deprecation")
             String pluginVersionFromIdea = KotlinPluginUtil.getPluginVersionFromIdea();
-            currentVersion.setText(KotlinConfigurationBundle.message("text.patched.original", pluginVersion, pluginVersionFromIdea));
+            currentVersion.setText(KotlinBundle.message("configuration.text.patched.original", pluginVersion, pluginVersionFromIdea));
         } else {
             currentVersion.setText(pluginVersion);
         }
@@ -107,7 +107,7 @@ public class KotlinLanguageConfigurationForm {
     private void showVerifierDisabledStatus() {
         //noinspection UnresolvedPropertyKey
         if (!Registry.is("kotlin.plugin.update.verifier.enabled", true)) {
-            verifierDisabledText.setText(KotlinConfigurationBundle.message("message.verifier.disabled"));
+            verifierDisabledText.setText(KotlinBundle.message("configuration.message.verifier.disabled"));
         }
         else {
             verifierDisabledText.setText("");
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NotPropertyListPanel.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NotPropertyListPanel.kt
index 235c9b6ebb1..fb36df4a945 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NotPropertyListPanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NotPropertyListPanel.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.configuration.ui
 import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.ui.NonEmptyInputValidator
 import com.intellij.ui.AddEditRemovePanel
-import org.jetbrains.kotlin.idea.configuration.KotlinConfigurationBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.name.FqNameUnsafe
 
 class NotPropertyListPanel(data: MutableList<FqNameUnsafe>) : AddEditRemovePanel<FqNameUnsafe>(MyTableModel(), data) {
@@ -22,8 +22,8 @@ class NotPropertyListPanel(data: MutableList<FqNameUnsafe>) : AddEditRemovePanel
 
     override fun editItem(fqName: FqNameUnsafe): FqNameUnsafe? {
         val result = Messages.showInputDialog(
-            this, KotlinConfigurationBundle.message("message.enter.fully.qualified.method.name"),
-            KotlinConfigurationBundle.message("title.edit.exclusion"),
+            this, KotlinBundle.message("configuration.message.enter.fully.qualified.method.name"),
+            KotlinBundle.message("configuration.title.edit.exclusion"),
             Messages.getQuestionIcon(),
             fqName.asString(),
             NonEmptyInputValidator()
@@ -40,8 +40,8 @@ class NotPropertyListPanel(data: MutableList<FqNameUnsafe>) : AddEditRemovePanel
 
     override fun addItem(): FqNameUnsafe? {
         val result = Messages.showInputDialog(
-            this, KotlinConfigurationBundle.message("message.enter.fully.qualified.method.name"),
-            KotlinConfigurationBundle.message("text.add.exclusion"),
+            this, KotlinBundle.message("configuration.message.enter.fully.qualified.method.name"),
+            KotlinBundle.message("configuration.text.add.exclusion"),
             Messages.getQuestionIcon(),
             "",
             NonEmptyInputValidator()
@@ -58,7 +58,7 @@ class NotPropertyListPanel(data: MutableList<FqNameUnsafe>) : AddEditRemovePanel
 
     class MyTableModel : AddEditRemovePanel.TableModel<FqNameUnsafe>() {
         override fun getField(o: FqNameUnsafe, columnIndex: Int) = o.asString()
-        override fun getColumnName(columnIndex: Int) = KotlinConfigurationBundle.message("name.method")
+        override fun getColumnName(columnIndex: Int) = KotlinBundle.message("configuration.name.method")
         override fun getColumnCount() = 1
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/migrationNotification.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/migrationNotification.kt
index f11e4d64d58..9b4038f70e6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/migrationNotification.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/migrationNotification.kt
@@ -9,17 +9,17 @@ import com.intellij.notification.*
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.idea.configuration.KotlinConfigurationBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.configuration.MigrationInfo
 import org.jetbrains.kotlin.idea.migration.CodeMigrationAction
 
 internal fun showMigrationNotification(project: Project, migrationInfo: MigrationInfo) {
     val detectedChangeMessage = buildString {
-        appendBr(KotlinConfigurationBundle.message("migration.text.detected.migration"))
+        appendBr(KotlinBundle.message("configuration.migration.text.detected.migration"))
         if (migrationInfo.oldStdlibVersion != migrationInfo.newStdlibVersion) {
             appendIndentBr(
-                KotlinConfigurationBundle.message(
-                    "migration.text.standard.library",
+                KotlinBundle.message(
+                    "configuration.migration.text.standard.library",
                     migrationInfo.oldStdlibVersion,
                     migrationInfo.newStdlibVersion
                 )
@@ -28,8 +28,8 @@ internal fun showMigrationNotification(project: Project, migrationInfo: Migratio
 
         if (migrationInfo.oldLanguageVersion != migrationInfo.newLanguageVersion) {
             appendIndentBr(
-                KotlinConfigurationBundle.message(
-                    "migration.text.language.version",
+                KotlinBundle.message(
+                    "configuration.migration.text.language.version",
                     migrationInfo.oldLanguageVersion,
                     migrationInfo.newLanguageVersion
                 )
@@ -38,8 +38,8 @@ internal fun showMigrationNotification(project: Project, migrationInfo: Migratio
 
         if (migrationInfo.oldApiVersion != migrationInfo.newApiVersion) {
             appendIndentBr(
-                KotlinConfigurationBundle.message(
-                    "migration.text.api.version",
+                KotlinBundle.message(
+                    "configuration.migration.text.api.version",
                     migrationInfo.oldApiVersion,
                     migrationInfo.newApiVersion
                 )
@@ -49,13 +49,13 @@ internal fun showMigrationNotification(project: Project, migrationInfo: Migratio
 
     KOTLIN_MIGRATION_NOTIFICATION_GROUP
         .createNotification(
-            KotlinConfigurationBundle.message("migration.title.kotlin.migration"),
-            "${KotlinConfigurationBundle.message("migration.text.migrations.for.kotlin.code.are.available")}<br/><br/>$detectedChangeMessage",
+            KotlinBundle.message("configuration.migration.title.kotlin.migration"),
+            "${KotlinBundle.message("configuration.migration.text.migrations.for.kotlin.code.are.available")}<br/><br/>$detectedChangeMessage",
             NotificationType.WARNING,
             null
         )
         .also { notification ->
-            notification.addAction(NotificationAction.createSimple(KotlinConfigurationBundle.message("migration.text.run.migrations")) {
+            notification.addAction(NotificationAction.createSimple(KotlinBundle.message("configuration.migration.text.run.migrations")) {
                 val projectContext = SimpleDataContext.getProjectContext(project)
                 val action = ActionManager.getInstance().getAction(CodeMigrationAction.ACTION_ID)
                 Notification.fire(notification, action, projectContext)
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
index 901ae038168..8c4cfe5e9d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPasteProcessor.kt
@@ -32,6 +32,7 @@ import com.intellij.openapi.util.ThrowableComputable
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.*
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.actions.JavaToKotlinAction
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.codeInsight.KotlinCopyPasteReferenceProcessor
@@ -377,7 +378,7 @@ fun runPostProcessing(
                         processor.updateState(0, phase, description)
                     }
             },
-            KotlinCopyBundle.message("text.convert.java.to.kotlin"),
+            KotlinBundle.message("copy.text.convert.java.to.kotlin"),
             true,
             project
         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt
index 25a9afb44f9..ff69499f22a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedKotlinCode.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea.conversion.copy
 
 import com.intellij.codeInsight.editorActions.TextBlockTransferableData
+import org.jetbrains.kotlin.idea.KotlinBundle
 
 import java.awt.datatransfer.DataFlavor
 
@@ -29,6 +30,6 @@ class CopiedKotlinCode(val fileText: String, val startOffsets: IntArray, val end
     override fun setOffsets(offsets: IntArray?, index: Int) = index
 
     companion object {
-        val DATA_FLAVOR: DataFlavor = DataFlavor(CopiedKotlinCode::class.java, KotlinCopyBundle.message("text.copied.kotlin.code"))
+        val DATA_FLAVOR: DataFlavor = DataFlavor(CopiedKotlinCode::class.java, KotlinBundle.message("copy.text.copied.kotlin.code"))
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
deleted file mode 100644
index 235f95324d1..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinCopyBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.conversion.copy
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinCopyBundle"
-
-object KotlinCopyBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
index 6237c124779..f8602e9b759 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
@@ -20,6 +20,7 @@ import com.intellij.CommonBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions;
 
 import javax.swing.*;
@@ -39,9 +40,10 @@ public class KotlinPasteFromJavaDialog extends DialogWrapper {
         super(project, true);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
-        setTitle(KotlinCopyBundle.message("title.convert.code.from.java"));
+        setTitle(KotlinBundle.message("copy.title.convert.code.from.java"));
         if (isPlainText) {
-            questionLabel.setText(KotlinCopyBundle.message("text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin"));
+            questionLabel.setText(
+                    KotlinBundle.message("copy.text.clipboard.content.seems.to.be.java.code.do.you.want.to.convert.it.to.kotlin"));
             //TODO: should we also use different set of settings?
         }
         init();
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
index c07b9fba8a8..84dedfdc252 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
@@ -24,6 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
@@ -134,7 +135,7 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers
         }
 
         ProgressManager.getInstance().runProcessWithProgressSynchronously(
-            task, KotlinCopyBundle.message("text.adding.imports"), true, project
+            task, KotlinBundle.message("copy.text.adding.imports"), true, project
         )
     }
 
@@ -229,7 +230,7 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers
         }
 
         ProgressManager.getInstance().runProcessWithProgressSynchronously(
-            task, KotlinCopyBundle.message("text.resolving.references"), true, project
+            task, KotlinBundle.message("copy.text.resolving.references"), true, project
         )
 
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
deleted file mode 100644
index 39179c19096..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.editor
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinEditorBundle"
-
-object KotlinEditorBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
index 151104c817e..cd79b03cf4f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.editor;
 import com.intellij.openapi.options.BeanConfigurable;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.ui.IdeBorderFactory;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 
 import javax.swing.*;
 
@@ -15,13 +16,13 @@ public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEdit
     public KotlinEditorOptionsConfigurable() {
         super(KotlinEditorOptions.getInstance());
         KotlinEditorOptions instance = KotlinEditorOptions.getInstance();
-        checkBox(KotlinEditorBundle.message("checkbox.title.convert.pasted.java.code.to.kotlin"),
+        checkBox(KotlinBundle.message("editor.checkbox.title.convert.pasted.java.code.to.kotlin"),
                  instance::isEnableJavaToKotlinConversion,
                  instance::setEnableJavaToKotlinConversion);
-        checkBox(KotlinEditorBundle.message("checkbox.title.don.t.show.java.to.kotlin.conversion.dialog.on.paste"),
+        checkBox(KotlinBundle.message("editor.checkbox.title.don.t.show.java.to.kotlin.conversion.dialog.on.paste"),
                  instance::isDonTShowConversionDialog,
                  instance::setDonTShowConversionDialog);
-        checkBox(KotlinEditorBundle.message("checkbox.title.auto.add.val.keyword.to.data.inline.class.constructor.parameters"),
+        checkBox(KotlinBundle.message("editor.checkbox.title.auto.add.val.keyword.to.data.inline.class.constructor.parameters"),
                  instance::isAutoAddValKeywordToDataClassParameters,
                  instance::setAutoAddValKeywordToDataClassParameters);
     }
@@ -29,7 +30,7 @@ public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEdit
     @Override
     public JComponent createComponent() {
         JComponent component = super.createComponent();
-        component.setBorder(IdeBorderFactory.createTitledBorder(KotlinEditorBundle.message("title.kotlin")));
+        component.setBorder(IdeBorderFactory.createTitledBorder(KotlinBundle.message("editor.title.kotlin")));
         return component;
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
deleted file mode 100644
index b68f57030f3..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.facet
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFacetBundle"
-
-object KotlinFacetBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetCompilerPluginsTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetCompilerPluginsTab.kt
index bec9c2a118b..5045e5f26b8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetCompilerPluginsTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetCompilerPluginsTab.kt
@@ -13,6 +13,7 @@ import com.intellij.ui.ScrollPaneFactory
 import com.intellij.ui.table.JBTable
 import org.jetbrains.kotlin.compiler.plugin.CliOptionValue
 import org.jetbrains.kotlin.compiler.plugin.parsePluginOption
+import org.jetbrains.kotlin.idea.KotlinBundle
 import java.awt.BorderLayout
 import java.awt.Component
 import javax.swing.*
@@ -62,8 +63,8 @@ class KotlinFacetCompilerPluginsTab(
         override fun getColumnCount() = 2
 
         override fun getColumnName(column: Int) = when (column) {
-            0 -> KotlinFacetBundle.message("column.name.plugin")
-            else -> KotlinFacetBundle.message("column.name.options")
+            0 -> KotlinBundle.message("facet.column.name.plugin")
+            else -> KotlinBundle.message("facet.column.name.options")
         }
 
         override fun getColumnClass(columnIndex: Int) = String::class.java
@@ -118,7 +119,7 @@ class KotlinFacetCompilerPluginsTab(
             val invalidOptions = optionsByTable.filter { parsePluginOption(it) == null }
             if (invalidOptions.isNotEmpty()) {
                 val message = buildString {
-                    append(KotlinFacetBundle.message("text.following.options.are.not.correct"))
+                    append(KotlinBundle.message("facet.text.following.options.are.not.correct"))
                     append(" <br/>")
                     invalidOptions.joinTo(this, "<br/>") { "<strong>$it</strong>" }
                 }
@@ -141,7 +142,7 @@ class KotlinFacetCompilerPluginsTab(
         validatorsManager.registerValidator(OptionValidator())
     }
 
-    override fun getDisplayName() = KotlinFacetBundle.message("name.compiler.plugins")
+    override fun getDisplayName() = KotlinBundle.message("facet.name.compiler.plugins")
 
     override fun createComponent(): JComponent {
         val panel = JPanel(BorderLayout())
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index e6df077f8c3..5a3bbe6010c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.cli.common.arguments.*
 import org.jetbrains.kotlin.config.CompilerSettings
 import org.jetbrains.kotlin.config.createArguments
 import org.jetbrains.kotlin.config.splitArgumentString
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.compiler.configuration.*
 import org.jetbrains.kotlin.idea.core.util.onTextChange
 import org.jetbrains.kotlin.platform.*
@@ -83,10 +84,12 @@ class KotlinFacetEditorGeneralTab(
         private fun FormBuilder.addTargetPlatformComponents(): FormBuilder {
             return if (configuration?.settings?.isHmppEnabled == true) {
                 targetPlatformLabel.toolTipText =
-                    KotlinFacetBundle.message("label.text.the.project.is.imported.from.external.build.system.and.could.not.be.edited")
-                this.addLabeledComponent(KotlinFacetBundle.message("label.text.selected.target.platforms"), targetPlatformLabel)
+                    KotlinBundle.message("facet.label.text.the.project.is.imported.from.external.build.system.and.could.not.be.edited")
+                this.addLabeledComponent(
+                    KotlinBundle.message("facet.label.text.selected.target.platforms"), targetPlatformLabel)
             } else {
-                this.addLabeledComponent(KotlinFacetBundle.message("label.text.target.platform"), targetPlatformSelectSingleCombobox)
+                this.addLabeledComponent(
+                    KotlinBundle.message("facet.label.text.target.platform"), targetPlatformSelectSingleCombobox)
             }
         }
 
@@ -132,7 +135,7 @@ class KotlinFacetEditorGeneralTab(
                 isMultiEditor
             )
 
-            useProjectSettingsCheckBox = ThreeStateCheckBox(KotlinFacetBundle.message("checkbox.text.use.project.settings")).apply { isThirdStateEnabled = isMultiEditor }
+            useProjectSettingsCheckBox = ThreeStateCheckBox(KotlinBundle.message("facet.checkbox.text.use.project.settings")).apply { isThirdStateEnabled = isMultiEditor }
             dependsOnLabel = JLabel()
 
             targetPlatformWrappers = CommonPlatforms.allDefaultTargetPlatforms.sortedBy { unifyJvmVersion(it.oldFashionedDescription) }
@@ -152,14 +155,14 @@ class KotlinFacetEditorGeneralTab(
                                 text =
                                     (value as? TargetPlatformWrapper)?.targetPlatform?.componentPlatforms?.singleOrNull()
                                         ?.oldFashionedDescription
-                                        ?: KotlinFacetBundle.message("text.multiplatform")
+                                        ?: KotlinBundle.message("facet.text.multiplatform")
                             }
                         }
                     })
                 }
             targetPlatformSelectSingleCombobox.maximumRowCount =
                 targetPlatformsComboboxRowsCount(targetPlatformWrappers.size)
-            projectSettingsLink = HoverHyperlinkLabel(KotlinFacetBundle.message("link.text.edit.project.settings")).apply {
+            projectSettingsLink = HoverHyperlinkLabel(KotlinBundle.message("facet.link.text.edit.project.settings")).apply {
                 addHyperlinkListener {
                     ShowSettingsUtilImpl.showSettingsDialog(project, compilerConfigurable.id, "")
                     if (useProjectSettingsCheckBox.isSelected) {
@@ -224,7 +227,8 @@ class KotlinFacetEditorGeneralTab(
 
     inner class ArgumentConsistencyValidator : FacetEditorValidator() {
         override fun check(): ValidationResult {
-            val platform = editor.getChosenPlatform() ?: return ValidationResult(KotlinFacetBundle.message("error.text.at.least.one.target.platform.should.be.selected"))
+            val platform = editor.getChosenPlatform() ?: return ValidationResult(
+                KotlinBundle.message("facet.error.text.at.least.one.target.platform.should.be.selected"))
             val primaryArguments = platform.createArguments {
                 editor.compilerConfigurable.applyTo(
                     this,
@@ -261,8 +265,8 @@ class KotlinFacetEditorGeneralTab(
                 val message = buildString {
                     if (overridingArguments.isNotEmpty()) {
                         append(
-                            KotlinFacetBundle.message(
-                                "text.following.arguments.override.facet.settings",
+                            KotlinBundle.message(
+                                "facet.text.following.arguments.override.facet.settings",
                                 overridingArguments.joinToString()
                             )
                         )
@@ -271,7 +275,8 @@ class KotlinFacetEditorGeneralTab(
                         if (isNotEmpty()) {
                             append("<br/>")
                         }
-                        append(KotlinFacetBundle.message("text.following.arguments.are.redundant", redundantArguments.joinToString()))
+                        append(
+                            KotlinBundle.message("facet.text.following.arguments.are.redundant", redundantArguments.joinToString()))
                     }
                 }
                 return ValidationResult(message)
@@ -431,7 +436,7 @@ class KotlinFacetEditorGeneralTab(
         }
     }
 
-    override fun getDisplayName() = KotlinFacetBundle.message("name.general")
+    override fun getDisplayName() = KotlinBundle.message("facet.name.general")
 
     override fun createComponent(): JComponent {
         return editor
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt b/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
index 10378b21e81..bf991e85063 100644
--- a/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
@@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.SimpleColoredComponent
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.ui.components.JBList
+import org.jetbrains.kotlin.idea.KotlinBundle
 import java.awt.Component
 import javax.swing.JList
 import javax.swing.ListCellRenderer
@@ -32,7 +33,7 @@ class InlineFunctionHyperLinkInfo(
             val list = JBList(inlineInfo)
             list.cellRenderer = InlineInfoCellRenderer()
             val popup = JBPopupFactory.getInstance().createListPopupBuilder(list)
-                .setTitle(KotlinFiltersBundle.message("title.navigate.to"))
+                .setTitle(KotlinBundle.message("filters.title.navigate.to"))
                 .setItemChoosenCallback {
                     val fileInfo = list.selectedValue as InlineInfo
                     OpenFileHyperlinkInfo(project, fileInfo.file, fileInfo.line).navigate(project)
@@ -54,10 +55,10 @@ class InlineFunctionHyperLinkInfo(
 
     sealed class InlineInfo(val prefix: String, val file: VirtualFile, val line: Int) {
         class CallSiteInfo(file: VirtualFile, line: Int) :
-            InlineInfo(KotlinFiltersBundle.message("text.inline.function.call.site"), file, line)
+            InlineInfo(KotlinBundle.message("filters.text.inline.function.call.site"), file, line)
 
         class InlineFunctionBodyInfo(file: VirtualFile, line: Int) :
-            InlineInfo(KotlinFiltersBundle.message("text.inline.function.body"), file, line)
+            InlineInfo(KotlinBundle.message("filters.text.inline.function.body"), file, line)
     }
 
     private class InlineInfoCellRenderer : SimpleColoredComponent(), ListCellRenderer<InlineInfo> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
deleted file mode 100644
index a9ca70e8b38..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/filters/KotlinFiltersBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.filters
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFiltersBundle"
-
-object KotlinFiltersBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
index cd5e77c2c3b..08b7252300d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
@@ -29,6 +29,7 @@ import com.intellij.usageView.UsageViewShortNameLocation
 import com.intellij.usageView.UsageViewTypeLocation
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.unwrapped
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.refactoring.rename.RenameJavaSyntheticPropertyHandler
 import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinPropertyProcessor
@@ -118,36 +119,36 @@ class KotlinElementDescriptionProvider : ElementDescriptionProvider {
 
         fun elementKind() = when (targetElement) {
             is KtClass -> if (targetElement.isInterface())
-                KotlinFindUsagesBundle.message("kotlin.lang.interface")
+                KotlinBundle.message("find.usages.interface")
             else
-                KotlinFindUsagesBundle.message("kotlin.lang.class")
+                KotlinBundle.message("find.usages.class")
             is KtObjectDeclaration -> if (targetElement.isCompanion())
-                KotlinFindUsagesBundle.message("kotlin.lang.companion.object")
+                KotlinBundle.message("find.usages.companion.object")
             else
-                KotlinFindUsagesBundle.message("kotlin.lang.object")
-            is KtNamedFunction -> KotlinFindUsagesBundle.message("kotlin.lang.function")
-            is KtPropertyAccessor -> KotlinFindUsagesBundle.message(
-                "kotlin.lang.for.property",
+                KotlinBundle.message("find.usages.object")
+            is KtNamedFunction -> KotlinBundle.message("find.usages.function")
+            is KtPropertyAccessor -> KotlinBundle.message(
+                "find.usages.for.property",
                 (if (targetElement.isGetter)
-                    KotlinFindUsagesBundle.message("kotlin.lang.getter")
+                    KotlinBundle.message("find.usages.getter")
                 else
-                    KotlinFindUsagesBundle.message("kotlin.lang.setter"))
+                    KotlinBundle.message("find.usages.setter"))
             ) + " "
-            is KtFunctionLiteral -> KotlinFindUsagesBundle.message("kotlin.lang.lambda")
-            is KtPrimaryConstructor, is KtSecondaryConstructor -> KotlinFindUsagesBundle.message("kotlin.lang.constructor")
+            is KtFunctionLiteral -> KotlinBundle.message("find.usages.lambda")
+            is KtPrimaryConstructor, is KtSecondaryConstructor -> KotlinBundle.message("find.usages.constructor")
             is KtProperty -> if (targetElement.isLocal)
-                KotlinFindUsagesBundle.message("kotlin.lang.variable")
+                KotlinBundle.message("find.usages.variable")
             else
-                KotlinFindUsagesBundle.message("kotlin.lang.property")
-            is KtTypeParameter -> KotlinFindUsagesBundle.message("kotlin.lang.type.parameter")
-            is KtParameter -> KotlinFindUsagesBundle.message("kotlin.lang.parameter")
-            is KtDestructuringDeclarationEntry -> KotlinFindUsagesBundle.message("kotlin.lang.variable")
-            is KtTypeAlias -> KotlinFindUsagesBundle.message("kotlin.lang.type.alias")
-            is KtLabeledExpression -> KotlinFindUsagesBundle.message("kotlin.lang.label")
-            is KtImportAlias -> KotlinFindUsagesBundle.message("kotlin.lang.import.alias")
-            is RenameJavaSyntheticPropertyHandler.SyntheticPropertyWrapper -> KotlinFindUsagesBundle.message("kotlin.lang.property")
-            is KtLightClassForFacade -> KotlinFindUsagesBundle.message("kotlin.lang.facade.class")
-            is RenameKotlinPropertyProcessor.PropertyMethodWrapper -> KotlinFindUsagesBundle.message("kotlin.lang.property.accessor")
+                KotlinBundle.message("find.usages.property")
+            is KtTypeParameter -> KotlinBundle.message("find.usages.type.parameter")
+            is KtParameter -> KotlinBundle.message("find.usages.parameter")
+            is KtDestructuringDeclarationEntry -> KotlinBundle.message("find.usages.variable")
+            is KtTypeAlias -> KotlinBundle.message("find.usages.type.alias")
+            is KtLabeledExpression -> KotlinBundle.message("find.usages.label")
+            is KtImportAlias -> KotlinBundle.message("find.usages.import.alias")
+            is RenameJavaSyntheticPropertyHandler.SyntheticPropertyWrapper -> KotlinBundle.message("find.usages.property")
+            is KtLightClassForFacade -> KotlinBundle.message("find.usages.facade.class")
+            is RenameKotlinPropertyProcessor.PropertyMethodWrapper -> KotlinBundle.message("find.usages.property.accessor")
             else -> null
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
deleted file mode 100644
index f27c1dd706e..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesBundle.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.findUsages
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFindUsagesBundle"
-
-object KotlinFindUsagesBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-
-    @JvmStatic
-    fun lazyMessage(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt
index d012ff51b02..9b6d6a8631f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt
@@ -28,6 +28,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.asJava.unwrapped
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.isOverridable
 import org.jetbrains.kotlin.idea.findUsages.handlers.DelegatingFindMemberUsagesHandler
 import org.jetbrains.kotlin.idea.findUsages.handlers.KotlinFindClassUsagesHandler
@@ -64,7 +65,7 @@ class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactor
                         val declarationsToSearch = checkSuperMethods(
                             element,
                             null,
-                            KotlinFindUsagesBundle.message("action.text.find.usages.of")
+                            KotlinBundle.message("find.usages.action.text.find.usages.of")
                         )
 
                         return handlerForMultiple(element, declarationsToSearch)
@@ -101,7 +102,7 @@ class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactor
                 val declarationsToSearch = checkSuperMethods(
                     declaration,
                     null,
-                    KotlinFindUsagesBundle.message("action.text.find.usages.of")
+                    KotlinBundle.message("find.usages.action.text.find.usages.of")
                 )
 
                 return handlerForMultiple(declaration, declarationsToSearch)
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
index a838e415397..c205744cce7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
@@ -11,6 +11,7 @@ import com.intellij.lang.java.JavaFindUsagesProvider
 import com.intellij.psi.*
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.*
@@ -30,17 +31,17 @@ class KotlinFindUsagesProvider : FindUsagesProvider {
 
     override fun getType(element: PsiElement): String {
         return when (element) {
-            is KtNamedFunction -> KotlinFindUsagesBundle.message("kotlin.lang.function")
-            is KtClass -> KotlinFindUsagesBundle.message("kotlin.lang.class")
-            is KtParameter -> KotlinFindUsagesBundle.message("kotlin.lang.parameter")
+            is KtNamedFunction -> KotlinBundle.message("find.usages.function")
+            is KtClass -> KotlinBundle.message("find.usages.class")
+            is KtParameter -> KotlinBundle.message("find.usages.parameter")
             is KtProperty -> if (element.isLocal)
-                KotlinFindUsagesBundle.message("kotlin.lang.variable")
+                KotlinBundle.message("find.usages.variable")
             else
-                KotlinFindUsagesBundle.message("kotlin.lang.property")
-            is KtDestructuringDeclarationEntry -> KotlinFindUsagesBundle.message("kotlin.lang.variable")
-            is KtTypeParameter -> KotlinFindUsagesBundle.message("kotlin.lang.type.parameter")
-            is KtSecondaryConstructor -> KotlinFindUsagesBundle.message("kotlin.lang.constructor")
-            is KtObjectDeclaration -> KotlinFindUsagesBundle.message("kotlin.lang.object")
+                KotlinBundle.message("find.usages.property")
+            is KtDestructuringDeclarationEntry -> KotlinBundle.message("find.usages.variable")
+            is KtTypeParameter -> KotlinBundle.message("find.usages.type.parameter")
+            is KtSecondaryConstructor -> KotlinBundle.message("find.usages.constructor")
+            is KtObjectDeclaration -> KotlinBundle.message("find.usages.object")
             else -> ""
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
index 2bbd4705c27..859d2253b26 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.usages.UsageTarget
 import com.intellij.usages.impl.rules.UsageType
 import com.intellij.usages.impl.rules.UsageTypeProviderEx
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
 
 object KotlinUsageTypeProvider : UsageTypeProviderEx {
@@ -74,35 +75,35 @@ object KotlinUsageTypeProvider : UsageTypeProviderEx {
 
 object KotlinUsageTypes {
     // types
-    val TYPE_CONSTRAINT = UsageType(KotlinFindUsagesBundle.message("find.usages.type.type.constraint"))
-    val VALUE_PARAMETER_TYPE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.value.parameter.type"))
-    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.nonLocal.property.type"))
-    val FUNCTION_RETURN_TYPE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.function.return.type"))
-    val SUPER_TYPE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.superType"))
-    val IS = UsageType(KotlinFindUsagesBundle.message("find.usages.type.is"))
-    val CLASS_OBJECT_ACCESS = UsageType(KotlinFindUsagesBundle.message("find.usages.type.class.object"))
-    val COMPANION_OBJECT_ACCESS = UsageType(KotlinFindUsagesBundle.message("find.usages.type.companion.object"))
-    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.extension.receiver.type"))
-    val SUPER_TYPE_QUALIFIER = UsageType(KotlinFindUsagesBundle.message("find.usages.type.super.type.qualifier"))
-    val TYPE_ALIAS = UsageType(KotlinFindUsagesBundle.message("type.type.alias"))
+    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(KotlinBundle.message("find.usages.type.type.alias"))
 
     // functions
-    val FUNCTION_CALL = UsageType(KotlinFindUsagesBundle.message("find.usages.type.function.call"))
-    val IMPLICIT_GET = UsageType(KotlinFindUsagesBundle.message("find.usages.type.implicit.get"))
-    val IMPLICIT_SET = UsageType(KotlinFindUsagesBundle.message("find.usages.type.implicit.set"))
-    val IMPLICIT_INVOKE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.implicit.invoke"))
-    val IMPLICIT_ITERATION = UsageType(KotlinFindUsagesBundle.message("find.usages.type.implicit.iteration"))
-    val PROPERTY_DELEGATION = UsageType(KotlinFindUsagesBundle.message("find.usages.type.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(KotlinFindUsagesBundle.message("find.usages.type.receiver"))
-    val DELEGATE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.delegate"))
+    val RECEIVER = UsageType(KotlinBundle.message("find.usages.type.receiver"))
+    val DELEGATE = UsageType(KotlinBundle.message("find.usages.type.delegate"))
 
     // packages
-    val PACKAGE_DIRECTIVE = UsageType(KotlinFindUsagesBundle.message("find.usages.type.packageDirective"))
-    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinFindUsagesBundle.message("find.usages.type.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(KotlinFindUsagesBundle.message("find.usages.type.callable.reference"))
-    val NAMED_ARGUMENT = UsageType(KotlinFindUsagesBundle.message("type.named.argument"))
+    val CALLABLE_REFERENCE = UsageType(KotlinBundle.message("find.usages.type.callable.reference"))
+    val NAMED_ARGUMENT = UsageType(KotlinBundle.message("find.usages.type.named.argument"))
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt.201 b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt.201
index 83a7ce21c84..3f10e9ed73d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt.201
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt.201
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.usages.UsageTarget
 import com.intellij.usages.impl.rules.UsageType
 import com.intellij.usages.impl.rules.UsageTypeProviderEx
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
 
 object KotlinUsageTypeProvider : UsageTypeProviderEx {
@@ -74,35 +75,35 @@ object KotlinUsageTypeProvider : UsageTypeProviderEx {
 
 object KotlinUsageTypes {
     // types
-    val TYPE_CONSTRAINT = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.type.constraint"))
-    val VALUE_PARAMETER_TYPE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.value.parameter.type"))
-    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.nonLocal.property.type"))
-    val FUNCTION_RETURN_TYPE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.function.return.type"))
-    val SUPER_TYPE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.superType"))
-    val IS = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.is"))
-    val CLASS_OBJECT_ACCESS = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.class.object"))
-    val COMPANION_OBJECT_ACCESS = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.companion.object"))
-    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.extension.receiver.type"))
-    val SUPER_TYPE_QUALIFIER = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.super.type.qualifier"))
-    val TYPE_ALIAS = UsageType(KotlinFindUsagesBundle.lazyMessage("type.type.alias"))
+    val TYPE_CONSTRAINT = UsageType(KotlinBundle.lazyMessage("find.usages.type.type.constraint"))
+    val VALUE_PARAMETER_TYPE = UsageType(KotlinBundle.lazyMessage("find.usages.type.value.parameter.type"))
+    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinBundle.lazyMessage("find.usages.type.nonLocal.property.type"))
+    val FUNCTION_RETURN_TYPE = UsageType(KotlinBundle.lazyMessage("find.usages.type.function.return.type"))
+    val SUPER_TYPE = UsageType(KotlinBundle.lazyMessage("find.usages.type.superType"))
+    val IS = UsageType(KotlinBundle.lazyMessage("find.usages.type.is"))
+    val CLASS_OBJECT_ACCESS = UsageType(KotlinBundle.lazyMessage("find.usages.type.class.object"))
+    val COMPANION_OBJECT_ACCESS = UsageType(KotlinBundle.lazyMessage("find.usages.type.companion.object"))
+    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinBundle.lazyMessage("find.usages.type.extension.receiver.type"))
+    val SUPER_TYPE_QUALIFIER = UsageType(KotlinBundle.lazyMessage("find.usages.type.super.type.qualifier"))
+    val TYPE_ALIAS = UsageType(KotlinBundle.lazyMessage("type.type.alias"))
 
     // functions
-    val FUNCTION_CALL = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.function.call"))
-    val IMPLICIT_GET = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.implicit.get"))
-    val IMPLICIT_SET = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.implicit.set"))
-    val IMPLICIT_INVOKE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.implicit.invoke"))
-    val IMPLICIT_ITERATION = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.implicit.iteration"))
-    val PROPERTY_DELEGATION = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.property.delegation"))
+    val FUNCTION_CALL = UsageType(KotlinBundle.lazyMessage("find.usages.type.function.call"))
+    val IMPLICIT_GET = UsageType(KotlinBundle.lazyMessage("find.usages.type.implicit.get"))
+    val IMPLICIT_SET = UsageType(KotlinBundle.lazyMessage("find.usages.type.implicit.set"))
+    val IMPLICIT_INVOKE = UsageType(KotlinBundle.lazyMessage("find.usages.type.implicit.invoke"))
+    val IMPLICIT_ITERATION = UsageType(KotlinBundle.lazyMessage("find.usages.type.implicit.iteration"))
+    val PROPERTY_DELEGATION = UsageType(KotlinBundle.lazyMessage("find.usages.type.property.delegation"))
 
     // values
-    val RECEIVER = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.receiver"))
-    val DELEGATE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.delegate"))
+    val RECEIVER = UsageType(KotlinBundle.lazyMessage("find.usages.type.receiver"))
+    val DELEGATE = UsageType(KotlinBundle.lazyMessage("find.usages.type.delegate"))
 
     // packages
-    val PACKAGE_DIRECTIVE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.packageDirective"))
-    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.packageMemberAccess"))
+    val PACKAGE_DIRECTIVE = UsageType(KotlinBundle.lazyMessage("find.usages.type.packageDirective"))
+    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinBundle.lazyMessage("find.usages.type.packageMemberAccess"))
 
     // common usage types
-    val CALLABLE_REFERENCE = UsageType(KotlinFindUsagesBundle.lazyMessage("find.usages.type.callable.reference"))
-    val NAMED_ARGUMENT = UsageType(KotlinFindUsagesBundle.lazyMessage("type.named.argument"))
+    val CALLABLE_REFERENCE = UsageType(KotlinBundle.lazyMessage("find.usages.type.callable.reference"))
+    val NAMED_ARGUMENT = UsageType(KotlinBundle.lazyMessage("type.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 d89977a41b2..3e1d0906984 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
 import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt;
 import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions;
-import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesBundle;
 import org.jetbrains.kotlin.idea.refactoring.RenderingUtilsKt;
 import org.jetbrains.kotlin.psi.KtClass;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
@@ -75,7 +74,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog {
 
         String name = classOrObject.getName();
         if (name == null || name.isEmpty()) {
-            name = KotlinFindUsagesBundle.message("class.name.anonymous");
+            name = KotlinBundle.message("find.usages.class.name.anonymous");
         }
 
         PsiClass javaClass;
@@ -166,7 +165,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog {
         KotlinClassFindUsagesOptions options = getFindUsagesOptions();
         if (isActual) {
             expectedUsages = addCheckboxToPanel(
-                    KotlinFindUsagesBundle.message("checkbox.name.expected.classes"),
+                    KotlinBundle.message("find.usages.checkbox.name.expected.classes"),
                     options.getSearchExpected(),
                     optionsPanel,
                     false
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 191d5719002..4bb1973cc06 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
@@ -30,7 +30,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod;
 import org.jetbrains.kotlin.idea.KotlinBundle;
-import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesBundle;
 import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions;
 import org.jetbrains.kotlin.idea.refactoring.RenderingUtilsKt;
 import org.jetbrains.kotlin.psi.KtDeclaration;
@@ -111,7 +110,7 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog {
         KotlinFunctionFindUsagesOptions options = getFindUsagesOptions();
         if (isActual) {
             expectedUsages = addCheckboxToPanel(
-                    KotlinFindUsagesBundle.message("checkbox.name.expected.functions"),
+                    KotlinBundle.message("find.usages.checkbox.name.expected.functions"),
                     options.getSearchExpected(),
                     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 9c568a28a81..cb0742860e8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
@@ -28,7 +28,6 @@ import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.StateRestoringCheckBox;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinBundle;
-import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesBundle;
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.*;
@@ -128,7 +127,7 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
         KotlinPropertyFindUsagesOptions options = getFindUsagesOptions();
         if (isActual) {
             expectedUsages = addCheckboxToPanel(
-                    KotlinFindUsagesBundle.message("checkbox.name.expected.properties"),
+                    KotlinBundle.message("find.usages.checkbox.name.expected.properties"),
                     options.getSearchExpected(),
                     optionsPanel,
                     false
@@ -137,9 +136,9 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
 
         if (isDataClassConstructorProperty(property)) {
             JCheckBox dataClassComponentCheckBox =
-                    new JCheckBox(KotlinFindUsagesBundle.message("checkbox.text.fast.data.class.component.search"));
-            dataClassComponentCheckBox.setToolTipText(KotlinFindUsagesBundle.message(
-                    "tool.tip.text.disable.search.for.data.class.components.and.destruction.declarations.project.wide.setting"));
+                    new JCheckBox(KotlinBundle.message("find.usages.checkbox.text.fast.data.class.component.search"));
+            dataClassComponentCheckBox.setToolTipText(KotlinBundle.message(
+                    "find.usages.tool.tip.text.disable.search.for.data.class.components.and.destruction.declarations.project.wide.setting"));
             Project project = property.getProject();
             dataClassComponentCheckBox.setSelected(getDisableComponentAndDestructionSearch(project));
             optionsPanel.add(dataClassComponentCheckBox);
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
index aa50aeef015..c3b7733433f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
@@ -43,6 +43,7 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ParameterDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.debugger.readAction
 import org.jetbrains.kotlin.idea.findUsages.*
@@ -310,8 +311,8 @@ abstract class KotlinFindMemberUsagesHandler<T : KtNamedDeclaration> protected c
 
         private const val DISABLE_ONCE = "DISABLE_ONCE"
         private const val DISABLE = "DISABLE"
-        private val DISABLE_COMPONENT_AND_DESTRUCTION_SEARCH_TEXT = KotlinFindUsagesBundle.message(
-            "text.find.usages.for.data.class.components.and.destruction.declarations",
+        private val DISABLE_COMPONENT_AND_DESTRUCTION_SEARCH_TEXT = KotlinBundle.message(
+            "find.usages.text.find.usages.for.data.class.components.and.destruction.declarations",
             DISABLE_ONCE,
             DISABLE
         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
index c892f00b565..7ee4d968953 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
@@ -14,6 +14,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.PackageEntryTable
 import com.intellij.ui.OptionGroup
 import com.intellij.ui.components.JBScrollPane
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import java.awt.BorderLayout
 import java.awt.GridBagConstraints
@@ -49,7 +50,7 @@ class ImportSettingsPanelWrapper(settings: CodeStyleSettings) : CodeStyleAbstrac
 }
 
 class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPanel() {
-    private val cbImportNestedClasses = JCheckBox(KotlinFormatterBundle.message("checkbox.text.insert.imports.for.nested.classes"))
+    private val cbImportNestedClasses = JCheckBox(KotlinBundle.message("formatter.checkbox.text.insert.imports.for.nested.classes"))
 
     private val starImportPackageEntryTable = PackageEntryTable()
     private val dummyImportLayoutPanel = object : ImportLayoutPanel() {
@@ -59,11 +60,11 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
     private val starImportPackageTable = ImportLayoutPanel.createTableForPackageEntries(starImportPackageEntryTable, dummyImportLayoutPanel)
 
     private val nameCountToUseStarImportSelector = NameCountToUseStarImportSelector(
-        KotlinFormatterBundle.message("title.top.level.symbols"), KotlinCodeStyleSettings.defaultSettings().NAME_COUNT_TO_USE_STAR_IMPORT
+        KotlinBundle.message("formatter.title.top.level.symbols"), KotlinCodeStyleSettings.defaultSettings().NAME_COUNT_TO_USE_STAR_IMPORT
     )
 
     private val nameCountToUseStarImportForMembersSelector = NameCountToUseStarImportSelector(
-        KotlinFormatterBundle.message("title.java.statics.and.enum.members"),
+        KotlinBundle.message("formatter.title.java.statics.and.enum.members"),
         KotlinCodeStyleSettings.defaultSettings().NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS
     )
 
@@ -82,7 +83,8 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
             add(nameCountToUseStarImportForMembersSelector.createPanel(), constraints.apply { gridy++ })
 
             add(
-                OptionGroup(KotlinFormatterBundle.message("title.other")).apply { add(cbImportNestedClasses) }.createPanel(),
+                OptionGroup(
+                    KotlinBundle.message("formatter.title.other")).apply { add(cbImportNestedClasses) }.createPanel(),
                 constraints.apply { gridy++ })
 
             add(PackagePanel.createPackagesPanel(starImportPackageTable, starImportPackageEntryTable), constraints.apply {
@@ -158,9 +160,9 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
     }
 
     private class NameCountToUseStarImportSelector(title: String, default: Int) : OptionGroup(title) {
-        private val rbUseSingleImports = JRadioButton(KotlinFormatterBundle.message("button.text.use.single.name.import"))
-        private val rbUseStarImports = JRadioButton(KotlinFormatterBundle.message("button.text.use.import.with"))
-        private val rbUseStarImportsIfAtLeast = JRadioButton(KotlinFormatterBundle.message("button.text.use.import.with.when.at.least"))
+        private val rbUseSingleImports = JRadioButton(KotlinBundle.message("formatter.button.text.use.single.name.import"))
+        private val rbUseStarImports = JRadioButton(KotlinBundle.message("formatter.button.text.use.import.with"))
+        private val rbUseStarImportsIfAtLeast = JRadioButton(KotlinBundle.message("formatter.button.text.use.import.with.when.at.least"))
         private val starImportLimitModel = SpinnerNumberModel(default, 2, 100, 1)
         private val starImportLimitField = JSpinner(starImportLimitModel)
 
@@ -179,7 +181,7 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
                 this.add(rbUseStarImportsIfAtLeast, constraints)
                 this.add(starImportLimitField, constraints)
                 this.add(
-                    JLabel(KotlinFormatterBundle.message("text.names.used")),
+                    JLabel(KotlinBundle.message("formatter.text.names.used")),
                     constraints.apply { fill = GridBagConstraints.HORIZONTAL; weightx = 1.0 })
             }, true)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
deleted file mode 100644
index 6402fd9da00..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormatterBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.formatter
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFormatterBundle"
-
-object KotlinFormatterBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt
index 3d49d24d926..bc34b18c797 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.kt
@@ -11,6 +11,7 @@ import com.intellij.openapi.application.ApplicationBundle
 import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import kotlin.reflect.KProperty
@@ -194,61 +195,61 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_AROUND_RANGE,
-                    KotlinFormatterBundle.message("title.range.operator"),
+                    KotlinBundle.message("formatter.title.range.operator"),
                     CodeStyleSettingsCustomizable.SPACES_AROUND_OPERATORS
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_BEFORE_TYPE_COLON,
-                    KotlinFormatterBundle.message("title.before.colon.after.declaration.name"),
+                    KotlinBundle.message("formatter.title.before.colon.after.declaration.name"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_AFTER_TYPE_COLON,
-                    KotlinFormatterBundle.message("title.after.colon.before.declaration.type"),
+                    KotlinBundle.message("formatter.title.after.colon.before.declaration.type"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_BEFORE_EXTEND_COLON,
-                    KotlinFormatterBundle.message("title.before.colon.in.new.type.definition"),
+                    KotlinBundle.message("formatter.title.before.colon.in.new.type.definition"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_AFTER_EXTEND_COLON,
-                    KotlinFormatterBundle.message("title.after.colon.in.new.type.definition"),
+                    KotlinBundle.message("formatter.title.after.colon.in.new.type.definition"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD,
-                    KotlinFormatterBundle.message("title.in.simple.one.line.methods"),
+                    KotlinBundle.message("formatter.title.in.simple.one.line.methods"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_AROUND_FUNCTION_TYPE_ARROW,
-                    KotlinFormatterBundle.message("title.around.arrow.in.function.types"),
+                    KotlinBundle.message("formatter.title.around.arrow.in.function.types"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_AROUND_WHEN_ARROW,
-                    KotlinFormatterBundle.message("title.around.arrow.in"),
+                    KotlinBundle.message("formatter.title.around.arrow.in"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_BEFORE_LAMBDA_ARROW,
-                    KotlinFormatterBundle.message("title.before.lambda.arrow"),
+                    KotlinBundle.message("formatter.title.before.lambda.arrow"),
                     CodeStyleSettingsCustomizable.SPACES_OTHER
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::SPACE_BEFORE_WHEN_PARENTHESES,
-                    KotlinFormatterBundle.message("title.when.parentheses"),
+                    KotlinBundle.message("formatter.title.when.parentheses"),
                     CodeStyleSettingsCustomizable.SPACES_BEFORE_PARENTHESES
                 )
             }
@@ -287,59 +288,59 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                 )
                 consumer.renameStandardOption(
                     CodeStyleSettingsCustomizable.WRAPPING_SWITCH_STATEMENT,
-                    KotlinFormatterBundle.message("title.when.statements")
+                    KotlinBundle.message("formatter.title.when.statements")
                 )
-                consumer.renameStandardOption("FIELD_ANNOTATION_WRAP", KotlinFormatterBundle.message("title.property.annotations"))
+                consumer.renameStandardOption("FIELD_ANNOTATION_WRAP", KotlinBundle.message("formatter.title.property.annotations"))
                 consumer.renameStandardOption(
                     "METHOD_PARAMETERS_WRAP",
-                    KotlinFormatterBundle.message("title.function.declaration.parameters")
+                    KotlinBundle.message("formatter.title.function.declaration.parameters")
                 )
-                consumer.renameStandardOption("CALL_PARAMETERS_WRAP", KotlinFormatterBundle.message("title.function.call.arguments"))
-                consumer.renameStandardOption("METHOD_CALL_CHAIN_WRAP", KotlinFormatterBundle.message("title.chained.function.calls"))
-                consumer.renameStandardOption("METHOD_ANNOTATION_WRAP", KotlinFormatterBundle.message("title.function.annotations"))
+                consumer.renameStandardOption("CALL_PARAMETERS_WRAP", KotlinBundle.message("formatter.title.function.call.arguments"))
+                consumer.renameStandardOption("METHOD_CALL_CHAIN_WRAP", KotlinBundle.message("formatter.title.chained.function.calls"))
+                consumer.renameStandardOption("METHOD_ANNOTATION_WRAP", KotlinBundle.message("formatter.title.function.annotations"))
                 consumer.renameStandardOption(
                     CodeStyleSettingsCustomizable.WRAPPING_METHOD_PARENTHESES,
-                    KotlinFormatterBundle.message("title.function.parentheses")
+                    KotlinBundle.message("formatter.title.function.parentheses")
                 )
 
                 showCustomOption(KotlinCodeStyleSettings::ALLOW_TRAILING_COMMA, "Use trailing comma")
 
                 showCustomOption(
                     KotlinCodeStyleSettings::ALIGN_IN_COLUMNS_CASE_BRANCH,
-                    KotlinFormatterBundle.message("title.align.when.branches.in.columns"),
+                    KotlinBundle.message("formatter.title.align.when.branches.in.columns"),
                     CodeStyleSettingsCustomizable.WRAPPING_SWITCH_STATEMENT
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::LBRACE_ON_NEXT_LINE,
-                    KotlinFormatterBundle.message("title.put.left.brace.on.new.line"),
+                    KotlinBundle.message("formatter.title.put.left.brace.on.new.line"),
                     CodeStyleSettingsCustomizable.WRAPPING_BRACES
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_PARAMETER_LISTS,
-                    KotlinFormatterBundle.message("title.use.continuation.indent"),
+                    KotlinBundle.message("formatter.title.use.continuation.indent"),
                     CodeStyleSettingsCustomizable.WRAPPING_METHOD_PARAMETERS
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_ARGUMENT_LISTS,
-                    KotlinFormatterBundle.message("title.use.continuation.indent"),
+                    KotlinBundle.message("formatter.title.use.continuation.indent"),
                     CodeStyleSettingsCustomizable.WRAPPING_METHOD_ARGUMENTS_WRAPPING
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_FOR_CHAINED_CALLS,
-                    KotlinFormatterBundle.message("title.use.continuation.indent"),
+                    KotlinBundle.message("formatter.title.use.continuation.indent"),
                     CodeStyleSettingsCustomizable.WRAPPING_CALL_CHAIN
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_SUPERTYPE_LISTS,
-                    KotlinFormatterBundle.message("title.use.continuation.indent"),
+                    KotlinBundle.message("formatter.title.use.continuation.indent"),
                     CodeStyleSettingsCustomizable.WRAPPING_EXTENDS_LIST
                 )
 
                 showCustomOption(
                     KotlinCodeStyleSettings::WRAP_EXPRESSION_BODY_FUNCTIONS,
-                    KotlinFormatterBundle.message("title.expression.body.functions"),
+                    KotlinBundle.message("formatter.title.expression.body.functions"),
                     options = *arrayOf(
                         CodeStyleSettingsCustomizable.WRAP_OPTIONS_FOR_SINGLETON,
                         CodeStyleSettingsCustomizable.WRAP_VALUES_FOR_SINGLETON
@@ -347,12 +348,12 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_FOR_EXPRESSION_BODIES,
-                    KotlinFormatterBundle.message("title.use.continuation.indent"),
-                    KotlinFormatterBundle.message("title.expression.body.functions")
+                    KotlinBundle.message("formatter.title.use.continuation.indent"),
+                    KotlinBundle.message("formatter.title.expression.body.functions")
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::WRAP_ELVIS_EXPRESSIONS,
-                    KotlinFormatterBundle.message("title.elvis.expressions"),
+                    KotlinBundle.message("formatter.title.elvis.expressions"),
                     options = *arrayOf(
                         CodeStyleSettingsCustomizable.WRAP_OPTIONS_FOR_SINGLETON,
                         CodeStyleSettingsCustomizable.WRAP_VALUES_FOR_SINGLETON
@@ -360,8 +361,8 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_ELVIS,
-                    title = KotlinFormatterBundle.message("title.use.continuation.indent"),
-                    groupName = KotlinFormatterBundle.message("title.elvis.expressions")
+                    title = KotlinBundle.message("formatter.title.use.continuation.indent"),
+                    groupName = KotlinBundle.message("formatter.title.elvis.expressions")
                 )
                 @Suppress("InvalidBundleOrProperty")
                 showCustomOption(
@@ -371,7 +372,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_IF_CONDITIONS,
-                    KotlinFormatterBundle.message("title.use.continuation.indent.in.conditions"),
+                    KotlinBundle.message("formatter.title.use.continuation.indent.in.conditions"),
                     CodeStyleSettingsCustomizable.WRAPPING_IF_STATEMENT
                 )
             }
@@ -384,7 +385,7 @@ class KotlinLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvide
                 )
                 showCustomOption(
                     KotlinCodeStyleSettings::BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES,
-                    KotlinFormatterBundle.message("title.around.when.branches.with"),
+                    KotlinBundle.message("formatter.title.around.when.branches.with"),
                     CodeStyleSettingsCustomizable.BLANK_LINES
                 )
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSaveStylePanel.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSaveStylePanel.kt
index e1ce9ed1b43..3d3e8bcfa37 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSaveStylePanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSaveStylePanel.kt
@@ -15,6 +15,7 @@ import com.intellij.ui.components.panels.HorizontalLayout
 import com.intellij.ui.components.panels.VerticalLayout
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
+import org.jetbrains.kotlin.idea.KotlinBundle
 import java.awt.BorderLayout
 import javax.swing.BorderFactory
 import javax.swing.JLabel
@@ -27,7 +28,7 @@ class KotlinSaveStylePanel(settings: CodeStyleSettings) : CodeStyleAbstractPanel
     override fun getFileType() = throw UnsupportedOperationException()
     override fun getPreviewText(): String? = null
 
-    override fun getTabTitle(): String = KotlinFormatterBundle.message("title.load.save")
+    override fun getTabTitle(): String = KotlinBundle.message("formatter.title.load.save")
 
     private data class SaveItem(val label: String, val id: String?)
 
@@ -63,7 +64,7 @@ class KotlinSaveStylePanel(settings: CodeStyleSettings) : CodeStyleAbstractPanel
                             }
                         })
 
-                        add(JLabel(KotlinFormatterBundle.message("text.use.defaults.from")))
+                        add(JLabel(KotlinBundle.message("formatter.text.use.defaults.from")))
                         add(saveDefaultsComboBox)
                     })
                 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
deleted file mode 100644
index 28e0e15e429..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinFrameworkBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.framework
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFrameworkBundle"
-
-object KotlinFrameworkBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt
index b9f83dade33..3928717d5c8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt
@@ -11,6 +11,7 @@ import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.util.Consumer
 import org.jdom.Element
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
@@ -45,7 +46,7 @@ class KotlinSdkType : SdkType("KotlinSDK") {
         }
     }
 
-    override fun getPresentableName() = KotlinFrameworkBundle.message("name.kotlin.sdk")
+    override fun getPresentableName() = KotlinBundle.message("framework.name.kotlin.sdk")
 
     override fun getIcon() = KotlinIcons.SMALL_LOGO
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt.192 b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt.192
index 04291b78aac..6248341590b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt.192
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt.192
@@ -11,6 +11,7 @@ import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.util.Consumer
 import org.jdom.Element
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
@@ -45,7 +46,7 @@ class KotlinSdkType : SdkType("KotlinSDK") {
         }
     }
 
-    override fun getPresentableName() = KotlinFrameworkBundle.message("name.kotlin.sdk")
+    override fun getPresentableName() = KotlinBundle.message("name.kotlin.sdk")
 
     override fun getIcon() = KotlinIcons.SMALL_LOGO
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
deleted file mode 100644
index dbc7d352651..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.hierarchy
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinHierarchyBundle"
-
-object KotlinHierarchyBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt
index 1e74fd59cbd..c76cdae9fa1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt
@@ -30,7 +30,7 @@ import com.intellij.psi.PsiReference
 import com.intellij.ui.LayeredIcon
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
-import org.jetbrains.kotlin.idea.hierarchy.KotlinHierarchyBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -163,7 +163,7 @@ class KotlinCallHierarchyNodeDescriptor(
                                     elementText = if (element.name != null) {
                                         renderClassOrObject(descriptor as ClassDescriptor)
                                     } else {
-                                        KotlinHierarchyBundle.message("text.anonymous")
+                                        KotlinBundle.message("hierarchy.text.anonymous")
                                     }
                                 }
                             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt
index 40233b18257..83348e06f10 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt
@@ -30,7 +30,7 @@ import com.intellij.ui.RowIcon
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor
-import org.jetbrains.kotlin.idea.hierarchy.KotlinHierarchyBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -141,7 +141,7 @@ class KotlinOverrideHierarchyNodeDescriptor(
             classDescriptor.parents.forEach { parentDescriptor ->
                 when (parentDescriptor) {
                     is MemberDescriptor -> {
-                        addText(KotlinHierarchyBundle.message("text.in", parentDescriptor.name.asString()), classNameAttributes)
+                        addText(KotlinBundle.message("hierarchy.text.in", parentDescriptor.name.asString()), classNameAttributes)
                         if (parentDescriptor is FunctionDescriptor) {
                             addText("()", classNameAttributes)
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
index 9347dcfc82e..a9acef96966 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.highlighter
 
-import com.intellij.ide.highlighter.JavaHighlightingColors
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.fileTypes.SyntaxHighlighter
 import com.intellij.openapi.options.OptionsBundle
@@ -130,70 +129,70 @@ var <PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION><MUTABLE_VARIABLE>globalCounte
         infix fun String.to(key: TextAttributesKey) = AttributesDescriptor(this, key)
 
         return arrayOf(
-            KotlinHighlighterBundle.message("description.text.builtin.keyword") to KotlinHighlightingColors.KEYWORD,
-            KotlinHighlighterBundle.message("description.text.builtin.keyword.val") to KotlinHighlightingColors.VAL_KEYWORD,
-            KotlinHighlighterBundle.message("description.text.builtin.keyword.var") to KotlinHighlightingColors.VAR_KEYWORD,
-            KotlinHighlighterBundle.message("description.text.builtin.annotation") to KotlinHighlightingColors.BUILTIN_ANNOTATION,
+            KotlinBundle.message("highlighter.descriptor.text.builtin.keyword") to KotlinHighlightingColors.KEYWORD,
+            KotlinBundle.message("highlighter.descriptor.text.builtin.keyword.val") to KotlinHighlightingColors.VAL_KEYWORD,
+            KotlinBundle.message("highlighter.descriptor.text.builtin.keyword.var") to KotlinHighlightingColors.VAR_KEYWORD,
+            KotlinBundle.message("highlighter.descriptor.text.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,
-            KotlinHighlighterBundle.message("description.text.string.escape") to KotlinHighlightingColors.STRING_ESCAPE,
+            KotlinBundle.message("highlighter.descriptor.text.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,
-            KotlinHighlighterBundle.message("description.text.closure.braces") to KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW,
-            KotlinHighlighterBundle.message("description.text.arrow") to KotlinHighlightingColors.ARROW,
+            KotlinBundle.message("highlighter.descriptor.text.closure.braces") to KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW,
+            KotlinBundle.message("highlighter.descriptor.text.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,
-            KotlinHighlighterBundle.message("description.text.colon") to KotlinHighlightingColors.COLON,
-            KotlinHighlighterBundle.message("description.text.double.colon") to KotlinHighlightingColors.DOUBLE_COLON,
+            KotlinBundle.message("highlighter.descriptor.text.colon") to KotlinHighlightingColors.COLON,
+            KotlinBundle.message("highlighter.descriptor.text.double.colon") to KotlinHighlightingColors.DOUBLE_COLON,
             OptionsBundle.message("options.java.attribute.descriptor.dot") to KotlinHighlightingColors.DOT,
-            KotlinHighlighterBundle.message("description.text.safe.access") to KotlinHighlightingColors.SAFE_ACCESS,
-            KotlinHighlighterBundle.message("description.text.quest") to KotlinHighlightingColors.QUEST,
-            KotlinHighlighterBundle.message("description.text.exclexcl") to KotlinHighlightingColors.EXCLEXCL,
+            KotlinBundle.message("highlighter.descriptor.text.safe.access") to KotlinHighlightingColors.SAFE_ACCESS,
+            KotlinBundle.message("highlighter.descriptor.text.quest") to KotlinHighlightingColors.QUEST,
+            KotlinBundle.message("highlighter.descriptor.text.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,
-            KotlinHighlighterBundle.message("description.text.kdoc.comment") to KotlinHighlightingColors.DOC_COMMENT,
-            KotlinHighlighterBundle.message("description.text.kdoc.tag") to KotlinHighlightingColors.KDOC_TAG,
-            KotlinHighlighterBundle.message("description.text.kdoc.value") to KotlinHighlightingColors.KDOC_LINK,
+            KotlinBundle.message("highlighter.descriptor.text.kdoc.comment") to KotlinHighlightingColors.DOC_COMMENT,
+            KotlinBundle.message("highlighter.descriptor.text.kdoc.tag") to KotlinHighlightingColors.KDOC_TAG,
+            KotlinBundle.message("highlighter.descriptor.text.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,
-            KotlinHighlighterBundle.message("description.text.annotation") to KotlinHighlightingColors.ANNOTATION,
-            KotlinBundle.message("description.text.annotation.attribute.name") to KotlinHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES,
-            KotlinHighlighterBundle.message("description.text.object") to KotlinHighlightingColors.OBJECT,
-            KotlinHighlighterBundle.message("description.text.enumEntry") to KotlinHighlightingColors.ENUM_ENTRY,
-            KotlinHighlighterBundle.message("description.text.typeAlias") to KotlinHighlightingColors.TYPE_ALIAS,
-            KotlinHighlighterBundle.message("description.text.var") to KotlinHighlightingColors.MUTABLE_VARIABLE,
-            KotlinHighlighterBundle.message("description.text.local.variable") to KotlinHighlightingColors.LOCAL_VARIABLE,
+            KotlinBundle.message("highlighter.descriptor.text.annotation") to KotlinHighlightingColors.ANNOTATION,
+            KotlinBundle.message("highlighter.descriptor.text.annotation.attribute.name") to KotlinHighlightingColors.ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES,
+            KotlinBundle.message("highlighter.descriptor.text.object") to KotlinHighlightingColors.OBJECT,
+            KotlinBundle.message("highlighter.descriptor.text.enumEntry") to KotlinHighlightingColors.ENUM_ENTRY,
+            KotlinBundle.message("highlighter.descriptor.text.typeAlias") to KotlinHighlightingColors.TYPE_ALIAS,
+            KotlinBundle.message("highlighter.descriptor.text.var") to KotlinHighlightingColors.MUTABLE_VARIABLE,
+            KotlinBundle.message("highlighter.descriptor.text.local.variable") to KotlinHighlightingColors.LOCAL_VARIABLE,
             OptionsBundle.message("options.java.attribute.descriptor.parameter") to KotlinHighlightingColors.PARAMETER,
-            KotlinHighlighterBundle.message("description.text.captured.variable") to KotlinHighlightingColors.WRAPPED_INTO_REF,
-            KotlinHighlighterBundle.message("description.text.instance.property") to KotlinHighlightingColors.INSTANCE_PROPERTY,
-            KotlinHighlighterBundle.message("description.text.instance.property.custom.property.declaration") to KotlinHighlightingColors.INSTANCE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
-            KotlinHighlighterBundle.message("description.text.package.property.custom.property.declaration") to KotlinHighlightingColors.PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
-            KotlinHighlighterBundle.message("description.text.package.property") to KotlinHighlightingColors.PACKAGE_PROPERTY,
-            KotlinHighlighterBundle.message("description.text.field") to KotlinHighlightingColors.BACKING_FIELD_VARIABLE,
-            KotlinHighlighterBundle.message("description.text.extension.property") to KotlinHighlightingColors.EXTENSION_PROPERTY,
-            KotlinHighlighterBundle.message("description.text.synthetic.extension.property") to KotlinHighlightingColors.SYNTHETIC_EXTENSION_PROPERTY,
-            KotlinHighlighterBundle.message("description.text.dynamic.property") to KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL,
-            KotlinHighlighterBundle.message("description.text.android.extensions.property") to KotlinHighlightingColors.ANDROID_EXTENSIONS_PROPERTY_CALL,
-            KotlinHighlighterBundle.message("description.text.it") to KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
-            KotlinHighlighterBundle.message("description.text.fun") to KotlinHighlightingColors.FUNCTION_DECLARATION,
-            KotlinHighlighterBundle.message("description.text.fun.call") to KotlinHighlightingColors.FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.dynamic.fun.call") to KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.suspend.fun.call") to KotlinHighlightingColors.SUSPEND_FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.package.fun.call") to KotlinHighlightingColors.PACKAGE_FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.extension.fun.call") to KotlinHighlightingColors.EXTENSION_FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.constructor.call") to KotlinHighlightingColors.CONSTRUCTOR_CALL,
-            KotlinHighlighterBundle.message("description.text.variable.as.function.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL,
-            KotlinHighlighterBundle.message("description.text.variable.as.function.like.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
-            KotlinHighlighterBundle.message("description.text.smart.cast") to KotlinHighlightingColors.SMART_CAST_VALUE,
-            KotlinHighlighterBundle.message("description.text.smart.constant") to KotlinHighlightingColors.SMART_CONSTANT,
-            KotlinHighlighterBundle.message("description.text.smart.cast.receiver") to KotlinHighlightingColors.SMART_CAST_RECEIVER,
-            KotlinHighlighterBundle.message("description.text.label") to KotlinHighlightingColors.LABEL,
-            KotlinHighlighterBundle.message("description.text.named.argument") to KotlinHighlightingColors.NAMED_ARGUMENT
+            KotlinBundle.message("highlighter.descriptor.text.captured.variable") to KotlinHighlightingColors.WRAPPED_INTO_REF,
+            KotlinBundle.message("highlighter.descriptor.text.instance.property") to KotlinHighlightingColors.INSTANCE_PROPERTY,
+            KotlinBundle.message("highlighter.descriptor.text.instance.property.custom.property.declaration") to KotlinHighlightingColors.INSTANCE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
+            KotlinBundle.message("highlighter.descriptor.text.package.property.custom.property.declaration") to KotlinHighlightingColors.PACKAGE_PROPERTY_CUSTOM_PROPERTY_DECLARATION,
+            KotlinBundle.message("highlighter.descriptor.text.package.property") to KotlinHighlightingColors.PACKAGE_PROPERTY,
+            KotlinBundle.message("highlighter.descriptor.text.field") to KotlinHighlightingColors.BACKING_FIELD_VARIABLE,
+            KotlinBundle.message("highlighter.descriptor.text.extension.property") to KotlinHighlightingColors.EXTENSION_PROPERTY,
+            KotlinBundle.message("highlighter.descriptor.text.synthetic.extension.property") to KotlinHighlightingColors.SYNTHETIC_EXTENSION_PROPERTY,
+            KotlinBundle.message("highlighter.descriptor.text.dynamic.property") to KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.android.extensions.property") to KotlinHighlightingColors.ANDROID_EXTENSIONS_PROPERTY_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.it") to KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
+            KotlinBundle.message("highlighter.descriptor.text.fun") to KotlinHighlightingColors.FUNCTION_DECLARATION,
+            KotlinBundle.message("highlighter.descriptor.text.fun.call") to KotlinHighlightingColors.FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.dynamic.fun.call") to KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.suspend.fun.call") to KotlinHighlightingColors.SUSPEND_FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.package.fun.call") to KotlinHighlightingColors.PACKAGE_FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.extension.fun.call") to KotlinHighlightingColors.EXTENSION_FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.constructor.call") to KotlinHighlightingColors.CONSTRUCTOR_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.variable.as.function.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.variable.as.function.like.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
+            KotlinBundle.message("highlighter.descriptor.text.smart.cast") to KotlinHighlightingColors.SMART_CAST_VALUE,
+            KotlinBundle.message("highlighter.descriptor.text.smart.constant") to KotlinHighlightingColors.SMART_CONSTANT,
+            KotlinBundle.message("highlighter.descriptor.text.smart.cast.receiver") to KotlinHighlightingColors.SMART_CAST_RECEIVER,
+            KotlinBundle.message("highlighter.descriptor.text.label") to KotlinHighlightingColors.LABEL,
+            KotlinBundle.message("highlighter.descriptor.text.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/KotlinHighlighterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
deleted file mode 100644
index 4b0b74adb5a..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighterBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.highlighter
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinHighlighterBundle"
-
-object KotlinHighlighterBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
index 8b9bc7bc124..d08c252fc83 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
@@ -26,6 +26,7 @@ import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.inspections.RecursivePropertyAccessorInspection
 import org.jetbrains.kotlin.idea.util.getReceiverTargetDescriptor
@@ -124,7 +125,7 @@ class KotlinRecursiveCallLineMarkerProvider : LineMarkerProvider {
         callElement.textRange,
         AllIcons.Gutter.RecursiveMethod,
         Pass.LINE_MARKERS,
-        { KotlinHighlighterBundle.message("tool.tip.text.recursive.call") },
+        { KotlinBundle.message("highlighter.tool.tip.text.recursive.call") },
         null,
         GutterIconRenderer.Alignment.RIGHT
     ) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
index ccfcc54da9e..adee69f7706 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptorWithAccessors
 import org.jetbrains.kotlin.descriptors.accessors
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.refactoring.getLineNumber
@@ -69,10 +70,10 @@ class KotlinSuspendCallLineMarkerProvider : LineMarkerProvider {
             result += if (element is KtForExpression) {
                 SuspendCallMarkerInfo(
                     getElementForLineMark(element.loopRange!!),
-                    KotlinHighlighterBundle.message("message.suspending.iteration")
+                    KotlinBundle.message("highlighter.message.suspending.iteration")
                 )
             } else {
-                SuspendCallMarkerInfo(getElementForLineMark(element), KotlinHighlighterBundle.message("message.suspend.function.call"))
+                SuspendCallMarkerInfo(getElementForLineMark(element), KotlinBundle.message("highlighter.message.suspend.function.call"))
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
index c89ca9c9b63..93bcf088d50 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
@@ -25,6 +25,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.util.Function
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.platform.tooling
 import org.jetbrains.kotlin.idea.project.platform
@@ -67,6 +68,6 @@ class KotlinTestRunLineMarkerContributor : RunLineMarkerContributor() {
 
         val targetPlatform = declaration.module?.platform ?: return null
         val icon = targetPlatform.idePlatformKind.tooling.getTestIcon(declaration, descriptor) ?: return null
-        return Info(icon, Function { KotlinHighlighterBundle.message("tool.tip.text.run.test") }, *ExecutorAction.getActions())
+        return Info(icon, Function { KotlinBundle.message("highlighter.tool.tip.text.run.test") }, *ExecutorAction.getActions())
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/dsl/DslHighlighterExtension.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/dsl/DslHighlighterExtension.kt
index 7db7e3ac5d9..0726056ebf8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/dsl/DslHighlighterExtension.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/dsl/DslHighlighterExtension.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.highlighter.HighlighterExtension
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.resolve.calls.DslMarkerUtils
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
@@ -45,10 +45,10 @@ class DslHighlighterExtension : HighlighterExtension() {
         fun externalKeyName(index: Int) = "KOTLIN_DSL_STYLE$index"
 
         val descriptionsToStyles = (1..numStyles).associate { index ->
-            KotlinHighlighterBundle.message("name.dsl") + styleOptionDisplayName(index) to styleById(index)
+            KotlinBundle.message("highlighter.name.dsl") + styleOptionDisplayName(index) to styleById(index)
         }
 
-        fun styleOptionDisplayName(index: Int) = KotlinHighlighterBundle.message("name.style") + index
+        fun styleOptionDisplayName(index: Int) = KotlinBundle.message("highlighter.name.style") + index
 
         fun styleIdByMarkerAnnotation(markerAnnotation: ClassDescriptor): Int? {
             val markerAnnotationFqName = markerAnnotation.fqNameSafe
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DslHighlightingMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DslHighlightingMarker.kt
index 5fbc534ce2f..8d093ed90d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DslHighlightingMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DslHighlightingMarker.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.toDescriptor
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.highlighter.dsl.DslHighlighterExtension
 import org.jetbrains.kotlin.idea.highlighter.dsl.isDslHighlightingMarker
 import org.jetbrains.kotlin.psi.KtClass
@@ -32,7 +32,7 @@ private val navHandler = GutterIconNavigationHandler<PsiElement> { event, elemen
 }
 
 private val toolTipHandler = Function<PsiElement, String> {
-    KotlinHighlighterBundle.message("tool.tip.marker.annotation.for.dsl")
+    KotlinBundle.message("highlighter.tool.tip.marker.annotation.for.dsl")
 }
 
 fun collectHighlightingColorsMarkers(
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
index 525a80ae3a0..1e2a11fdb4e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.core.isAndroidModule
 import org.jetbrains.kotlin.idea.core.toDescriptor
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.actualsForExpected
 import org.jetbrains.kotlin.platform.isCommon
 import org.jetbrains.kotlin.psi.KtDeclaration
@@ -53,8 +53,8 @@ fun getPlatformActualTooltip(declaration: KtDeclaration): String? {
         .groupBy { it.getPlatformName() }
         .filter { (platform, _) -> platform != null }
         .entries
-        .joinToString(prefix = KotlinHighlighterBundle.message("prefix.text.has.actuals.in") + " ") { (platform, modules) ->
-            val modulesSuffix = if (modules.size <= 1) "" else KotlinHighlighterBundle.message("text.modules", modules.size)
+        .joinToString(prefix = KotlinBundle.message("highlighter.prefix.text.has.actuals.in") + " ") { (platform, modules) ->
+            val modulesSuffix = if (modules.size <= 1) "" else KotlinBundle.message("highlighter.text.modules", modules.size)
             if (platform == null) {
                 throw AssertionError("Platform should not be null")
             }
@@ -69,9 +69,9 @@ class ActualExpectedPsiElementCellRenderer : DefaultPsiElementCellRenderer() {
     override fun getContainerText(element: PsiElement?, name: String?) = ""
 }
 
-fun KtDeclaration.navigateToActualTitle() = KotlinHighlighterBundle.message("title.choose.actual.for", name.toString())
+fun KtDeclaration.navigateToActualTitle() = KotlinBundle.message("highlighter.title.choose.actual.for", name.toString())
 
-fun KtDeclaration.navigateToActualUsagesTitle() = KotlinHighlighterBundle.message("title.actuals.for", name.toString())
+fun KtDeclaration.navigateToActualUsagesTitle() = KotlinBundle.message("highlighter.title.actuals.for", name.toString())
 
 fun buildNavigateToActualDeclarationsPopup(element: PsiElement?): NavigationPopupDescriptor? {
     return element?.markerDeclaration?.let {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
index 3586823ee30..1dfc687dd60 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor
 import org.jetbrains.kotlin.idea.caches.project.implementedDescriptors
 import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
 import org.jetbrains.kotlin.idea.core.toDescriptor
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.expectedDeclarationIfAny
 import org.jetbrains.kotlin.idea.util.hasDeclarationOf
 import org.jetbrains.kotlin.psi.KtDeclaration
@@ -33,15 +33,15 @@ fun getExpectedDeclarationTooltip(declaration: KtDeclaration): String? {
     val commonModuleDescriptors = platformModuleDescriptor.implementedDescriptors
     if (!commonModuleDescriptors.any { it.hasDeclarationOf(descriptor) }) return null
 
-    return KotlinHighlighterBundle.message("tool.tip.has.declaration.in.common.module")
+    return KotlinBundle.message("highlighter.tool.tip.has.declaration.in.common.module")
 }
 
 fun KtDeclaration.allNavigatableExpectedDeclarations(): List<KtDeclaration> =
     listOfNotNull(expectedDeclarationIfAny()) + findMarkerBoundDeclarations().mapNotNull { it.expectedDeclarationIfAny() }
 
-fun KtDeclaration.navigateToExpectedTitle() = KotlinHighlighterBundle.message("title.choose.expected.for", name.toString())
+fun KtDeclaration.navigateToExpectedTitle() = KotlinBundle.message("highlighter.title.choose.expected.for", name.toString())
 
-fun KtDeclaration.navigateToExpectedUsagesTitle() = KotlinHighlighterBundle.message("title.expected.for", name.toString())
+fun KtDeclaration.navigateToExpectedUsagesTitle() = KotlinBundle.message("highlighter.title.expected.for", name.toString())
 
 fun buildNavigateToExpectedDeclarationsPopup(element: PsiElement?): NavigationPopupDescriptor? {
     return element?.markerDeclaration?.let {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerOptions.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerOptions.kt
index 6f2aaf1992f..2ee06c59db1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerOptions.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerOptions.kt
@@ -8,43 +8,43 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 import com.intellij.codeInsight.daemon.GutterIconDescriptor
 import com.intellij.icons.AllIcons
 import org.jetbrains.kotlin.idea.KotlinIcons
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 
 internal object KotlinLineMarkerOptions {
     val overriddenOption = GutterIconDescriptor.Option(
         "kotlin.overridden",
-        KotlinHighlighterBundle.message("name.overridden.declaration"), AllIcons.Gutter.OverridenMethod
+        KotlinBundle.message("highlighter.name.overridden.declaration"), AllIcons.Gutter.OverridenMethod
     )
 
     val implementedOption = GutterIconDescriptor.Option(
         "kotlin.implemented",
-        KotlinHighlighterBundle.message("name.implemented.declaration"), AllIcons.Gutter.ImplementedMethod
+        KotlinBundle.message("highlighter.name.implemented.declaration"), AllIcons.Gutter.ImplementedMethod
     )
 
     val overridingOption = GutterIconDescriptor.Option(
         "kotlin.overriding",
-        KotlinHighlighterBundle.message("name.overriding.declaration"), AllIcons.Gutter.OverridingMethod
+        KotlinBundle.message("highlighter.name.overriding.declaration"), AllIcons.Gutter.OverridingMethod
     )
 
     val implementingOption =
         GutterIconDescriptor.Option(
             "kotlin.implementing",
-            KotlinHighlighterBundle.message("name.implementing.declaration"),
+            KotlinBundle.message("highlighter.name.implementing.declaration"),
             AllIcons.Gutter.ImplementingMethod
         )
 
     val actualOption = GutterIconDescriptor.Option(
         "kotlin.actual",
-        KotlinHighlighterBundle.message("name.multiplatform.actual.declaration"), KotlinIcons.ACTUAL
+        KotlinBundle.message("highlighter.name.multiplatform.actual.declaration"), KotlinIcons.ACTUAL
     )
 
     val expectOption = GutterIconDescriptor.Option(
         "kotlin.expect",
-        KotlinHighlighterBundle.message("name.multiplatform.expect.declaration"), KotlinIcons.EXPECT
+        KotlinBundle.message("highlighter.name.multiplatform.expect.declaration"), KotlinIcons.EXPECT
     )
 
     val dslOption =
-        GutterIconDescriptor.Option("kotlin.dsl", KotlinHighlighterBundle.message("name.dsl.markers"), KotlinIcons.DSL_MARKER_ANNOTATION)
+        GutterIconDescriptor.Option("kotlin.dsl", KotlinBundle.message("highlighter.name.dsl.markers"), KotlinIcons.DSL_MARKER_ANNOTATION)
 
     val options = arrayOf(
         overriddenOption, implementedOption,
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
index 1acdccc8a59..23bf82722c3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.core.isInheritable
 import org.jetbrains.kotlin.idea.core.isOverridable
 import org.jetbrains.kotlin.idea.core.toDescriptor
 import org.jetbrains.kotlin.idea.editor.fixers.startLine
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.presentation.DeclarationByModuleRenderer
 import org.jetbrains.kotlin.idea.search.declarationsSearch.toPossiblyFakeLightMethods
 import org.jetbrains.kotlin.idea.util.*
@@ -50,7 +50,7 @@ import java.util.*
 import javax.swing.ListCellRenderer
 
 class KotlinLineMarkerProvider : LineMarkerProviderDescriptor() {
-    override fun getName() = KotlinHighlighterBundle.message("name.kotlin.line.markers")
+    override fun getName() = KotlinBundle.message("highlighter.name.kotlin.line.markers")
 
     override fun getOptions(): Array<Option> = KotlinLineMarkerOptions.options
 
@@ -279,8 +279,8 @@ private fun collectSuperDeclarationMarkers(declaration: KtDeclaration, result: M
     )
     NavigateAction.setNavigateAction(
         lineMarkerInfo,
-        if (declaration is KtNamedFunction) KotlinHighlighterBundle.message("action.text.go.to.super.method") else KotlinHighlighterBundle.message(
-            "action.text.go.to.super.property"
+        if (declaration is KtNamedFunction) KotlinBundle.message("highlighter.action.text.go.to.super.method") else KotlinBundle.message(
+            "highlighter.action.text.go.to.super.property"
         ),
         IdeActions.ACTION_GOTO_SUPER
     )
@@ -311,8 +311,8 @@ private fun collectInheritedClassMarker(element: KtClass, result: MutableCollect
     )
     NavigateAction.setNavigateAction(
         lineMarkerInfo,
-        if (element.isInterface()) KotlinHighlighterBundle.message("action.text.go.to.implementations") else KotlinHighlighterBundle.message(
-            "action.text.go.to.subclasses"
+        if (element.isInterface()) KotlinBundle.message("highlighter.action.text.go.to.implementations") else KotlinBundle.message(
+            "highlighter.action.text.go.to.subclasses"
         ),
         IdeActions.ACTION_GOTO_IMPLEMENTATION
     )
@@ -351,7 +351,7 @@ private fun collectOverriddenPropertyAccessors(
         )
         NavigateAction.setNavigateAction(
             lineMarkerInfo,
-            KotlinHighlighterBundle.message("action.text.go.to.overridden.properties"),
+            KotlinBundle.message("highlighter.action.text.go.to.overridden.properties"),
             IdeActions.ACTION_GOTO_IMPLEMENTATION
         )
         result.add(lineMarkerInfo)
@@ -483,7 +483,7 @@ private fun collectActualMarkers(
     )
     NavigateAction.setNavigateAction(
         lineMarkerInfo,
-        KotlinHighlighterBundle.message("action.text.go.to.actual.declarations"),
+        KotlinBundle.message("highlighter.action.text.go.to.actual.declarations"),
         IdeActions.ACTION_GOTO_IMPLEMENTATION
     )
     result.add(lineMarkerInfo)
@@ -514,7 +514,7 @@ private fun collectExpectedMarkers(
     )
     NavigateAction.setNavigateAction(
         lineMarkerInfo,
-        KotlinHighlighterBundle.message("action.text.go.to.expected.declaration"),
+        KotlinBundle.message("highlighter.action.text.go.to.expected.declaration"),
         null
     )
     result.add(lineMarkerInfo)
@@ -553,7 +553,7 @@ private fun collectOverriddenFunctions(functions: Collection<KtNamedFunction>, r
         )
         NavigateAction.setNavigateAction(
             lineMarkerInfo,
-            KotlinHighlighterBundle.message("action.text.go.to.overridden.methods"),
+            KotlinBundle.message("highlighter.action.text.go.to.overridden.methods"),
             IdeActions.ACTION_GOTO_IMPLEMENTATION
         )
         result.add(lineMarkerInfo)
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
index 7749de41a27..2ae30dfbed6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
@@ -38,7 +38,7 @@ import gnu.trove.THashSet
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.elements.isTraitFakeOverride
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.presentation.DeclarationByModuleRenderer
 import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachDeclaredMemberOverride
 import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingMethod
@@ -89,7 +89,7 @@ fun getSubclassedClassTooltip(klass: PsiClass): String? {
         val functionalImplementations = PsiElementProcessor.CollectElementsWithLimit(2, THashSet<PsiFunctionalExpression>())
         FunctionalExpressionSearch.search(klass).forEach(PsiElementProcessorAdapter(functionalImplementations))
         return if (functionalImplementations.collection.isNotEmpty())
-            KotlinHighlighterBundle.message("text.has.functional.implementations")
+            KotlinBundle.message("highlighter.text.has.functional.implementations")
         else
             null
     }
@@ -98,12 +98,12 @@ fun getSubclassedClassTooltip(klass: PsiClass): String? {
     val shortcuts = ActionManager.getInstance().getAction(IdeActions.ACTION_GOTO_IMPLEMENTATION).shortcutSet.shortcuts
     val shortcut = shortcuts.firstOrNull()
     val shortCutText = if (shortcut != null)
-        KotlinHighlighterBundle.message("text.or.press", KeymapUtil.getShortcutText(shortcut))
+        KotlinBundle.message("highlighter.text.or.press", KeymapUtil.getShortcutText(shortcut))
     else
         ""
 
-    val postfix = "<br><div style=''margin-top: 5px''><font size=''2''>" + KotlinHighlighterBundle.message(
-        "text.click.for.navigate",
+    val postfix = "<br><div style=''margin-top: 5px''><font size=''2''>" + KotlinBundle.message(
+        "highlighter.text.click.for.navigate",
         shortCutText
     ) + "</font></div>"
 
@@ -148,7 +148,7 @@ fun buildNavigateToOverriddenMethodPopup(e: MouseEvent?, element: PsiElement?):
 
     if (DumbService.isDumb(method.project)) {
         DumbService.getInstance(method.project)
-            ?.showDumbModeNotification(KotlinHighlighterBundle.message("notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update"))
+            ?.showDumbModeNotification(KotlinBundle.message("highlighter.notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update"))
         return null
     }
 
@@ -161,7 +161,7 @@ fun buildNavigateToOverriddenMethodPopup(e: MouseEvent?, element: PsiElement?):
                     }
                 }
             },
-            KotlinHighlighterBundle.message("title.searching.for.overriding.declarations"), true, method.project, e?.component as JComponent?
+            KotlinBundle.message("highlighter.title.searching.for.overriding.declarations"), true, method.project, e?.component as JComponent?
         )
     ) {
         return null
@@ -177,7 +177,7 @@ fun buildNavigateToOverriddenMethodPopup(e: MouseEvent?, element: PsiElement?):
     return NavigationPopupDescriptor(
         overridingJavaMethods,
         methodsUpdater.getCaption(overridingJavaMethods.size),
-        KotlinHighlighterBundle.message("title.overriding.declarations.of", method.name),
+        KotlinBundle.message("highlighter.title.overriding.declarations.of", method.name),
         renderer,
         methodsUpdater
     )
@@ -187,7 +187,7 @@ private class OverridingMethodsUpdater(
     private val myMethod: PsiMethod,
     private val myRenderer: PsiElementListCellRenderer<out PsiElement>
 ) :
-    ListBackgroundUpdaterTask(myMethod.project, KotlinHighlighterBundle.message("title.searching.for.overriding.methods")) {
+    ListBackgroundUpdaterTask(myMethod.project, KotlinBundle.message("highlighter.title.searching.for.overriding.methods")) {
     override fun getCaption(size: Int): String {
         return if (myMethod.hasModifierProperty(PsiModifier.ABSTRACT))
             DaemonBundle.message("navigation.title.implementation.method", myMethod.name, size)!!
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 03d00f5c840..8d24b8c15bb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
@@ -33,7 +33,6 @@ import com.intellij.util.AdapterProcessor
 import com.intellij.util.CommonProcessors
 import com.intellij.util.Function
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
 import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingMethod
 import org.jetbrains.kotlin.idea.search.declarationsSearch.toPossiblyFakeLightMethods
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinDefinitionsSearcher
@@ -81,7 +80,8 @@ fun buildNavigateToPropertyOverriddenDeclarationsPopup(e: MouseEvent?, element:
     val project = propertyOrParameter.project
 
     if (DumbService.isDumb(project)) {
-        DumbService.getInstance(project)?.showDumbModeNotification(KotlinHighlighterBundle.message("notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update"))
+        DumbService.getInstance(project)?.showDumbModeNotification(
+            KotlinBundle.message("highlighter.notification.text.navigation.to.overriding.classes.is.not.possible.during.index.update"))
         return null
     }
 
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 18ace2032b4..248b38b219d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.codeInsight.KtFunctionPsiElementCellRenderer
 import org.jetbrains.kotlin.idea.core.getDirectlyOverriddenDeclarations
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighterBundle
 import org.jetbrains.kotlin.idea.search.usagesSearch.propertyDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtParameter
@@ -57,17 +56,17 @@ object SuperDeclarationMarkerTooltip : Function<PsiElement, String> {
         val containingStrings = overriddenDescriptors.map {
             val declaration = it.containingDeclaration
             val memberKind = if (it is PropertyAccessorDescriptor || it is PropertyDescriptor)
-                KotlinHighlighterBundle.message("tool.tip.text.property")
+                KotlinBundle.message("highlighter.tool.tip.text.property")
             else
-                KotlinHighlighterBundle.message("tool.tip.text.function")
+                KotlinBundle.message("highlighter.tool.tip.text.function")
 
             val isBaseAbstract = it.modality == Modality.ABSTRACT
-            KotlinHighlighterBundle.message(
-                "text.in",
+            KotlinBundle.message(
+                "highlighter.text.in",
                 "${if (!isAbstract && isBaseAbstract)
-                    KotlinHighlighterBundle.message("text.implements")
+                    KotlinBundle.message("highlighter.text.implements")
                 else
-                    KotlinHighlighterBundle.message("text.overrides")
+                    KotlinBundle.message("highlighter.text.overrides")
                 } $memberKind",
                 renderer.render(declaration)
             )
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index c925ea95ec3..78276b33262 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -13,6 +13,7 @@ import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.caches.project.ScriptModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo
@@ -43,14 +44,14 @@ class KotlinImportOptimizer : ImportOptimizer {
 
         return object : ImportOptimizer.CollectingInfoRunnable {
             override fun getUserNotificationInfo(): String = if (remove == 0)
-                KotlinImportsBundle.message("text.import.optimizer.zero")
+                KotlinBundle.message("import.optimizer.text.zero")
             else
-                KotlinImportsBundle.message(
-                    "text.import.optimizer.non.zero",
+                KotlinBundle.message(
+                    "import.optimizer.text.non.zero",
                     remove,
-                    KotlinImportsBundle.message("text.import.optimizer.import", remove),
+                    KotlinBundle.message("import.optimizer.text.import", remove),
                     add,
-                    KotlinImportsBundle.message("text.import.optimizer.import", add)
+                    KotlinBundle.message("import.optimizer.text.import", add)
                 )
 
             override fun run() = replaceImports(ktFile, imports)
@@ -225,7 +226,7 @@ class KotlinImportOptimizer : ImportOptimizer {
     companion object {
         fun collectDescriptorsToImport(file: KtFile, inProgressBar: Boolean = false): OptimizedImportsBuilder.InputData {
             val progressIndicator = if (inProgressBar) ProgressIndicatorProvider.getInstance().progressIndicator else null
-            progressIndicator?.text = KotlinImportsBundle.message("progress.indicator.text.collect.imports.for", file.name)
+            progressIndicator?.text = KotlinBundle.message("import.optimizer.progress.indicator.text.collect.imports.for", file.name)
             progressIndicator?.isIndeterminate = false
 
             val visitor = CollectUsedDescriptorsVisitor(file, progressIndicator)
@@ -270,7 +271,7 @@ class KotlinImportOptimizer : ImportOptimizer {
         private val DO_NOTHING = object : ImportOptimizer.CollectingInfoRunnable {
             override fun run() = Unit
 
-            override fun getUserNotificationInfo() = KotlinImportsBundle.message("notification.text.unused.imports.not.found")
+            override fun getUserNotificationInfo() = KotlinBundle.message("import.optimizer.notification.text.unused.imports.not.found")
         }
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
deleted file mode 100644
index 93b98ee748e..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportsBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.imports
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinImportsBundle"
-
-object KotlinImportsBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt
index 4d937170c61..30295fda876 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt
@@ -17,6 +17,7 @@ import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.ex.dummy.DummyFileSystem
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
@@ -27,12 +28,12 @@ fun showDecompiledCode(sourceFile: KtFile) {
 
 class KotlinBytecodeDecompilerTask(val file: KtFile) : Task.Backgroundable(
     file.project,
-    KotlinInternalBundle.message("action.text.decompile.kotlin.bytecode")
+    KotlinBundle.message("internal.action.text.decompile.kotlin.bytecode")
 ) {
     override fun run(indicator: ProgressIndicator) {
         val decompilerService = KotlinDecompilerService.getInstance() ?: return
 
-        indicator.text = KotlinInternalBundle.message("indicator.text.decompiling", file.name)
+        indicator.text = KotlinBundle.message("internal.indicator.text.decompiling", file.name)
 
         val decompiledText = try {
             decompilerService.decompile(file)
@@ -47,8 +48,8 @@ class KotlinBytecodeDecompilerTask(val file: KtFile) : Task.Backgroundable(
                 if (decompiledText == null) {
                     ApplicationManager.getApplication().invokeLater {
                         Messages.showErrorDialog(
-                            KotlinInternalBundle.message("error.text.cannot.decompile", file.name),
-                            KotlinInternalBundle.message("title.decompiler.error")
+                            KotlinBundle.message("internal.error.text.cannot.decompile", file.name),
+                            KotlinBundle.message("internal.title.decompiler.error")
                         )
                     }
                     return@runWriteAction
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
deleted file mode 100644
index 9e784838618..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinInternalBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.internal
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinInternalBundle"
-
-object KotlinInternalBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.kt
deleted file mode 100644
index d72884e0d73..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.refactoring
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinRefactoringBundle"
-
-object KotlinRefactoringBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String = getMessage(key, params)
-}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
index 579beb8b073..a207f702517 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations
 import org.jetbrains.kotlin.idea.refactoring.CallableRefactoring
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.broadcastRefactoringExit
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinChangePropertySignatureDialog
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinChangeSignatureDialog
@@ -92,8 +92,7 @@ class KotlinChangeSignature(
             is PsiMethod -> {
                 if (baseDeclaration.language != JavaLanguage.INSTANCE) {
                     Messages.showErrorDialog(
-                        KotlinRefactoringBundle.message(
-                            "error.text.can.t.change.signature.of.method",
+                        KotlinBundle.message("error.text.can.t.change.signature.of.method",
                             baseDeclaration.language.displayName
                         ),
                         commandName
@@ -121,8 +120,7 @@ class KotlinChangeSignature(
 
                 if (baseDeclaration.language != JavaLanguage.INSTANCE) {
                     Messages.showErrorDialog(
-                        KotlinRefactoringBundle.message(
-                            "error.text.can.t.change.signature.of.method",
+                        KotlinBundle.message("error.text.can.t.change.signature.of.method",
                             baseDeclaration.language.displayName
                         ), commandName
                     )
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt
index 1f3049001d8..2d50107c427 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZE
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.expectedDescriptor
 import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor
 import org.jetbrains.kotlin.psi.*
@@ -60,7 +60,7 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
         invokeChangeSignature(element, element, project, editor)
     }
 
-    override fun getTargetNotFoundMessage() = KotlinRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name")
+    override fun getTargetNotFoundMessage() = KotlinBundle.message("error.wrong.caret.position.function.or.constructor.name")
 
     companion object {
         fun findTargetForRefactoring(element: PsiElement): PsiElement? {
@@ -141,7 +141,7 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
                     CodeInsightUtils.showErrorHint(
                         project,
                         editor,
-                        KotlinRefactoringBundle.message("message.change.signature.is.not.applicable.to.dynamically.invoked.functions"),
+                        KotlinBundle.message("message.change.signature.is.not.applicable.to.dynamically.invoked.functions"),
                         RefactoringBundle.message("changeSignature.refactoring.name"),
                         null
                     )
@@ -171,7 +171,7 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
             return when (descriptor) {
                 is FunctionDescriptor -> {
                     if (descriptor.valueParameters.any { it.varargElementType != null }) {
-                        val message = KotlinRefactoringBundle.message("error.cant.refactor.vararg.functions")
+                        val message = KotlinBundle.message("error.cant.refactor.vararg.functions")
                         CommonRefactoringUtil.showErrorHint(
                             project,
                             editor,
@@ -183,7 +183,7 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
                     }
 
                     if (descriptor.kind === SYNTHESIZED) {
-                        val message = KotlinRefactoringBundle.message("cannot.refactor.synthesized.function", descriptor.name)
+                        val message = KotlinBundle.message("cannot.refactor.synthesized.function", descriptor.name)
                         CommonRefactoringUtil.showErrorHint(
                             project,
                             editor,
@@ -201,7 +201,8 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
 
                 else -> {
                     val message =
-                        RefactoringBundle.getCannotRefactorMessage(KotlinRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name"))
+                        RefactoringBundle.getCannotRefactorMessage(
+                            KotlinBundle.message("error.wrong.caret.position.function.or.constructor.name"))
                     CommonRefactoringUtil.showErrorHint(
                         project,
                         editor,
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
index 2d77e78a36a..fad3ba0509b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt
@@ -29,7 +29,7 @@ import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo
 import com.intellij.usageView.UsageInfo
 import com.intellij.usageView.UsageViewDescriptor
 import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.broadcastRefactoringExit
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinFunctionCallUsage
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinImplicitReceiverUsage
@@ -57,9 +57,9 @@ class KotlinChangeSignatureProcessor(
 
     override fun createUsageViewDescriptor(usages: Array<UsageInfo>): UsageViewDescriptor {
         val subject = if (ktChangeInfo.kind.isConstructor)
-            KotlinRefactoringBundle.message("text.constructor")
+            KotlinBundle.message("text.constructor")
         else
-            KotlinRefactoringBundle.message("text.function")
+            KotlinBundle.message("text.function")
         return KotlinUsagesViewDescriptor(myChangeInfo.method, RefactoringBundle.message("0.to.change.signature", subject))
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
index 1d9b5a67f51..b31cee944f0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
@@ -185,8 +186,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                             object : UnresolvableCollisionUsageInfo(callElement, null) {
                                 override fun getDescription(): String {
                                     val signature = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(callerDescriptor)
-                                    return KotlinRefactoringBundle.message(
-                                        "text.there.is.already.a.variable.0.in.1.it.will.conflict.with.the.new.parameter",
+                                    return KotlinBundle.message("text.there.is.already.a.variable.0.in.1.it.will.conflict.with.the.new.parameter",
                                         currentName,
                                         signature
                                     )
@@ -566,8 +566,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                 if (candidateTypes == newTypes) {
                     result.putValue(
                         conflictElement,
-                        KotlinRefactoringBundle.message(
-                            "text.function.already.exists",
+                        KotlinBundle.message("text.function.already.exists",
                             DescriptorRenderer.SHORT_NAMES_IN_TYPES.render(conflict)
                         )
                     )
@@ -581,7 +580,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             val parameterName = parameter.name
 
             if (!parameterNames.add(parameterName)) {
-                result.putValue(function, KotlinRefactoringBundle.message("text.duplicating.parameter", parameterName))
+                result.putValue(function, KotlinBundle.message("text.duplicating.parameter", parameterName))
             }
 
             if (parametersScope != null) {
@@ -591,7 +590,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                         if (propertyDeclaration.parent !is KtParameterList) {
                             result.putValue(
                                 propertyDeclaration,
-                                KotlinRefactoringBundle.message("text.duplicating.property", parameterName)
+                                KotlinBundle.message("text.duplicating.property", parameterName)
                             )
                             break
                         }
@@ -600,7 +599,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                     for (variable in parametersScope.getContributedVariables(Name.identifier(parameterName), NoLookupLocation.FROM_IDE)) {
                         if (variable is ValueParameterDescriptor) continue
                         val conflictElement = DescriptorToSourceUtils.descriptorToDeclaration(variable)
-                        result.putValue(conflictElement, KotlinRefactoringBundle.message("text.duplicating.local.variable", parameterName))
+                        result.putValue(conflictElement, KotlinBundle.message("text.duplicating.local.variable", parameterName))
                     }
                 }
             }
@@ -639,7 +638,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             val name = parameterInfo.name
             val parameter = existingParameters[name] ?: continue
 
-            result.putValue(parameter, KotlinRefactoringBundle.message("text.there.is.already.a.parameter", name, signature))
+            result.putValue(parameter, KotlinBundle.message("text.there.is.already.a.parameter", name, signature))
         }
     }
 
@@ -670,8 +669,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             if (labelExpr != null && newContext.get(BindingContext.AMBIGUOUS_LABEL_TARGET, labelExpr) != null) {
                 result.putValue(
                     originalExpr,
-                    KotlinRefactoringBundle.message(
-                        "text.parameter.reference.can.t.be.safely.replaced.with.0.since.1.is.ambiguous.in.this.context",
+                    KotlinBundle.message("text.parameter.reference.can.t.be.safely.replaced.with.0.since.1.is.ambiguous.in.this.context",
                         newExprText,
                         labelExpr.text
                     )
@@ -684,8 +682,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             if (thisTargetPsi != null && callable.isAncestor(thisTargetPsi, true)) {
                 result.putValue(
                     originalExpr,
-                    KotlinRefactoringBundle.message(
-                        "text.parameter.reference.can.t.be.safely.replaced.with.0.since.target.function.can.t.be.referenced.in.this.context",
+                    KotlinBundle.message("text.parameter.reference.can.t.be.safely.replaced.with.0.since.target.function.can.t.be.referenced.in.this.context",
                         newExprText
                     )
                 )
@@ -712,8 +709,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                 else -> continue@loop
             }
 
-            val message = KotlinRefactoringBundle.message(
-                "text.explicit.receiver.is.already.present.in.call.element.0",
+            val message = KotlinBundle.message("text.explicit.receiver.is.already.present.in.call.element.0",
                 CommonRefactoringUtil.htmlEmphasize(elementToReport.text)
             )
             result.putValue(callElement, message)
@@ -736,8 +732,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             if (qualifiedExpression is KtSafeQualifiedExpression) {
                 result.putValue(
                     callElement,
-                    KotlinRefactoringBundle.message(
-                        "text.receiver.can.t.be.safely.transformed.to.value.argument",
+                    KotlinBundle.message("text.receiver.can.t.be.safely.transformed.to.value.argument",
                         CommonRefactoringUtil.htmlEmphasize(qualifiedExpression.text)
                     )
                 )
@@ -780,7 +775,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                     val prefix = if (declaration != null) RefactoringUIUtil.getDescription(declaration, true) else originalRef.text
                     result.putValue(
                         originalRef,
-                        KotlinRefactoringBundle.message("text.0.will.no.longer.be.accessible.after.signature.change", prefix.capitalize())
+                        KotlinBundle.message("text.0.will.no.longer.be.accessible.after.signature.change", prefix.capitalize())
                     )
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
index d3d76c73357..a096ee4aaa9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallerChooser.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMethodDescriptor
 import org.jetbrains.kotlin.idea.hierarchy.calls.CalleeReferenceProcessor
 import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallHierarchyNodeDescriptor
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
@@ -49,9 +49,9 @@ class KotlinCallerChooser(
 
     override fun findDeepestSuperMethods(method: PsiElement) = method.toLightMethods().singleOrNull()?.findDeepestSuperMethods()
 
-    override fun getEmptyCallerText() = KotlinRefactoringBundle.message("text.caller.text.with.highlighted.callee.call.would.be.shown.here")
+    override fun getEmptyCallerText() = KotlinBundle.message("text.caller.text.with.highlighted.callee.call.would.be.shown.here")
 
-    override fun getEmptyCalleeText() = KotlinRefactoringBundle.message("text.callee.text.would.be.shown.here")
+    override fun getEmptyCalleeText() = KotlinBundle.message("text.callee.text.would.be.shown.here")
 }
 
 class KotlinMethodNode(
@@ -75,7 +75,7 @@ class KotlinMethodNode(
 
         val renderedFunction = KotlinCallHierarchyNodeDescriptor.renderNamedFunction(descriptor)
         val renderedFunctionWithContainer = containerName?.let {
-            "${if (it.isSpecial) KotlinRefactoringBundle.message("text.anonymous") else it.asString()}.$renderedFunction"
+            "${if (it.isSpecial) KotlinBundle.message("text.anonymous") else it.asString()}.$renderedFunction"
         } ?: renderedFunction
 
         val attributes = if (isEnabled)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
index 2b8ff0f67cf..0e6ac142c9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt
@@ -14,7 +14,7 @@ import com.intellij.util.ui.FormBuilder
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.*
 import org.jetbrains.kotlin.idea.refactoring.validateElement
 import org.jetbrains.kotlin.psi.KtExpression
@@ -43,7 +43,7 @@ class KotlinChangePropertySignatureDialog(
     private var receiverDefaultValueField: EditorTextField? = null
 
     init {
-        title = KotlinRefactoringBundle.message("title.change.signature")
+        title = KotlinBundle.message("title.change.signature")
         init()
     }
 
@@ -65,22 +65,22 @@ class KotlinChangePropertySignatureDialog(
             val baseDeclaration = methodDescriptor.baseDeclaration
             if ((baseDeclaration as? KtProperty)?.isLocal != true) {
                 visibilityCombo.selectedItem = methodDescriptor.visibility
-                addLabeledComponent(KotlinRefactoringBundle.message("label.text.visibility"), visibilityCombo)
+                addLabeledComponent(KotlinBundle.message("label.text.visibility"), visibilityCombo)
             }
 
-            addLabeledComponent(KotlinRefactoringBundle.message("label.text.name"), nameField)
+            addLabeledComponent(KotlinBundle.message("label.text.name"), nameField)
 
             val returnTypeCodeFragment = psiFactory.createTypeCodeFragment(
                 methodDescriptor.returnTypeInfo.render(),
                 baseDeclaration
             )
             returnTypeField = EditorTextField(documentManager.getDocument(returnTypeCodeFragment), myProject, KotlinFileType.INSTANCE)
-            addLabeledComponent(KotlinRefactoringBundle.message("label.text.type"), returnTypeField)
+            addLabeledComponent(KotlinBundle.message("label.text.type"), returnTypeField)
 
             if (baseDeclaration is KtProperty) {
                 addSeparator()
 
-                val receiverTypeCheckBox = JCheckBox(KotlinRefactoringBundle.message("checkbox.text.extension.property"))
+                val receiverTypeCheckBox = JCheckBox(KotlinBundle.message("checkbox.text.extension.property"))
                 receiverTypeCheckBox.addActionListener { updateReceiverUI() }
                 receiverTypeCheckBox.isSelected = methodDescriptor.receiver != null
                 addComponent(receiverTypeCheckBox)
@@ -92,7 +92,7 @@ class KotlinChangePropertySignatureDialog(
                 )
                 receiverTypeField =
                     EditorTextField(documentManager.getDocument(receiverTypeCodeFragment), myProject, KotlinFileType.INSTANCE)
-                receiverTypeLabel = JLabel(KotlinRefactoringBundle.message("label.text.receiver.type"))
+                receiverTypeLabel = JLabel(KotlinBundle.message("label.text.receiver.type"))
                 addLabeledComponent(receiverTypeLabel, receiverTypeField)
 
                 if (methodDescriptor.receiver == null) {
@@ -102,7 +102,7 @@ class KotlinChangePropertySignatureDialog(
                         myProject,
                         KotlinFileType.INSTANCE
                     )
-                    receiverDefaultValueLabel = JLabel(KotlinRefactoringBundle.message("label.text.default.receiver.value"))
+                    receiverDefaultValueLabel = JLabel(KotlinBundle.message("label.text.default.receiver.value"))
                     addLabeledComponent(receiverDefaultValueLabel, receiverDefaultValueField!!)
                 }
 
@@ -121,12 +121,15 @@ class KotlinChangePropertySignatureDialog(
     override fun canRun() {
         val psiFactory = KtPsiFactory(myProject)
 
-        psiFactory.createSimpleName(nameField.text).validateElement(KotlinRefactoringBundle.message("error.text.invalid.name"))
-        psiFactory.createType(returnTypeField.text).validateElement(KotlinRefactoringBundle.message("error.text.invalid.return.type"))
+        psiFactory.createSimpleName(nameField.text).validateElement(
+            KotlinBundle.message("error.text.invalid.name"))
+        psiFactory.createType(returnTypeField.text).validateElement(
+            KotlinBundle.message("error.text.invalid.return.type"))
         if (receiverTypeCheckBox?.isSelected == true) {
-            psiFactory.createType(receiverTypeField.text).validateElement(KotlinRefactoringBundle.message("error.text.invalid.receiver.type"))
+            psiFactory.createType(receiverTypeField.text).validateElement(
+                KotlinBundle.message("error.text.invalid.receiver.type"))
         }
-        getDefaultReceiverValue()?.validateElement(KotlinRefactoringBundle.message("error.text.invalid.default.receiver.value"))
+        getDefaultReceiverValue()?.validateElement(KotlinBundle.message("error.text.invalid.default.receiver.value"))
     }
 
     override fun doAction() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
index 5f07ab46845..e4635c837bb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.*
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor.Kind
 import org.jetbrains.kotlin.idea.refactoring.validateElement
@@ -106,7 +106,7 @@ class KotlinChangeSignatureDialog(
         val defaultValue = item.defaultValueCodeFragment.text
         val separator = StringUtil.repeatSymbol(' ', getParamNamesMaxLength() - parameterName.length + 1)
         val text = "$valOrVar$parameterName:$separator$typeText" + if (StringUtil.isNotEmpty(defaultValue)) {
-            KotlinRefactoringBundle.message("text.default.value", defaultValue)
+            KotlinBundle.message("text.default.value", defaultValue)
         } else {
             ""
         }
@@ -334,8 +334,7 @@ class KotlinChangeSignatureDialog(
         ) {
             if (Messages.showOkCancelDialog(
                     myProject,
-                    KotlinRefactoringBundle.message(
-                        "message.text.return.type.cannot.be.resolved",
+                    KotlinBundle.message("message.text.return.type.cannot.be.resolved",
                         myReturnTypeCodeFragment?.text.toString()
                     ),
                     RefactoringBundle.message("changeSignature.refactoring.name"),
@@ -349,13 +348,12 @@ class KotlinChangeSignatureDialog(
         for (item in parametersTableModel.items) {
             if (item.typeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false, reanalyse = true).type == null) {
                 val paramText = if (item.parameter != parametersTableModel.receiver)
-                    KotlinRefactoringBundle.message("text.parameter", item.parameter.name)
+                    KotlinBundle.message("text.parameter", item.parameter.name)
                 else
-                    KotlinRefactoringBundle.message("text.receiver")
+                    KotlinBundle.message("text.receiver")
                 if (Messages.showOkCancelDialog(
                         myProject,
-                        KotlinRefactoringBundle.message(
-                            "message.type.for.cannot.be.resolved",
+                        KotlinBundle.message("message.type.for.cannot.be.resolved",
                             item.typeCodeFragment.text,
                             paramText
                         ),
@@ -372,23 +370,21 @@ class KotlinChangeSignatureDialog(
 
     override fun canRun() {
         if (myNamePanel.isVisible && myMethod.canChangeName() && !methodName.isIdentifier()) {
-            throw ConfigurationException(KotlinRefactoringBundle.message("function.name.is.invalid"))
+            throw ConfigurationException(KotlinBundle.message("function.name.is.invalid"))
         }
 
         if (myMethod.canChangeReturnType() === MethodDescriptor.ReadWriteOption.ReadWrite) {
-            (myReturnTypeCodeFragment as? KtTypeCodeFragment)
-                ?.validateElement(KotlinRefactoringBundle.message("return.type.is.invalid"))
+            (myReturnTypeCodeFragment as? KtTypeCodeFragment)?.validateElement(KotlinBundle.message("return.type.is.invalid"))
         }
 
         for (item in parametersTableModel.items) {
             val parameterName = item.parameter.name
 
             if (item.parameter != parametersTableModel.receiver && !parameterName.isIdentifier()) {
-                throw ConfigurationException(KotlinRefactoringBundle.message("parameter.name.is.invalid", parameterName))
+                throw ConfigurationException(KotlinBundle.message("parameter.name.is.invalid", parameterName))
             }
 
-            (item.typeCodeFragment as? KtTypeCodeFragment)
-                ?.validateElement(KotlinRefactoringBundle.message("parameter.type.is.invalid", item.typeCodeFragment.text))
+            (item.typeCodeFragment as? KtTypeCodeFragment)?.validateElement(KotlinBundle.message("parameter.type.is.invalid", item.typeCodeFragment.text))
         }
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
index 6991486c862..1c7f7e87cf9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt.192
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.*
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor.Kind
 import org.jetbrains.kotlin.idea.refactoring.validateElement
@@ -107,7 +107,7 @@ class KotlinChangeSignatureDialog(
         val defaultValue = item.defaultValueCodeFragment.text
         val separator = StringUtil.repeatSymbol(' ', getParamNamesMaxLength() - parameterName.length + 1)
         val text = "$valOrVar$parameterName:$separator$typeText" + if (StringUtil.isNotEmpty(defaultValue)) {
-            KotlinRefactoringBundle.message("text.default.value", defaultValue)
+            KotlinBundle.message("text.default.value", defaultValue)
         } else {
             ""
         }
@@ -336,8 +336,7 @@ class KotlinChangeSignatureDialog(
         ) {
             if (Messages.showOkCancelDialog(
                     myProject,
-                    KotlinRefactoringBundle.message(
-                        "message.text.return.type.cannot.be.resolved",
+                    KotlinBundle.message("message.text.return.type.cannot.be.resolved",
                         myReturnTypeCodeFragment?.text.toString()
                     ),
                     RefactoringBundle.message("changeSignature.refactoring.name"),
@@ -351,13 +350,12 @@ class KotlinChangeSignatureDialog(
         for (item in parametersTableModel.items) {
             if (item.typeCodeFragment.getTypeInfo(isCovariant = true, forPreview = false).type == null) {
                 val paramText = if (item.parameter != parametersTableModel.receiver)
-                    KotlinRefactoringBundle.message("text.parameter", item.parameter.name)
+                    KotlinBundle.message("text.parameter", item.parameter.name)
                 else
-                    KotlinRefactoringBundle.message("text.receiver")
+                    KotlinBundle.message("text.receiver")
                 if (Messages.showOkCancelDialog(
                         myProject,
-                        KotlinRefactoringBundle.message(
-                            "message.type.for.cannot.be.resolved",
+                        KotlinBundle.message("message.type.for.cannot.be.resolved",
                             item.typeCodeFragment.text,
                             paramText
                         ),
@@ -374,23 +372,23 @@ class KotlinChangeSignatureDialog(
 
     override fun canRun() {
         if (myNamePanel.isVisible && myMethod.canChangeName() && !methodName.isIdentifier()) {
-            throw ConfigurationException(KotlinRefactoringBundle.message("function.name.is.invalid"))
+            throw ConfigurationException(KotlinBundle.message("function.name.is.invalid"))
         }
 
         if (myMethod.canChangeReturnType() === MethodDescriptor.ReadWriteOption.ReadWrite) {
             (myReturnTypeCodeFragment as? KtTypeCodeFragment)
-                ?.validateElement(KotlinRefactoringBundle.message("return.type.is.invalid"))
+                ?.validateElement(KotlinBundle.message("return.type.is.invalid"))
         }
 
         for (item in parametersTableModel.items) {
             val parameterName = item.parameter.name
 
             if (item.parameter != parametersTableModel.receiver && !parameterName.isIdentifier()) {
-                throw ConfigurationException(KotlinRefactoringBundle.message("parameter.name.is.invalid", parameterName))
+                throw ConfigurationException(KotlinBundle.message("parameter.name.is.invalid", parameterName))
             }
 
             (item.typeCodeFragment as? KtTypeCodeFragment)
-                ?.validateElement(KotlinRefactoringBundle.message("parameter.type.is.invalid", item.typeCodeFragment.text))
+                ?.validateElement(KotlinBundle.message("parameter.type.is.invalid", item.typeCodeFragment.text))
         }
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java
index ce1eb5addfe..8fe75e3970e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java
@@ -24,7 +24,7 @@ import com.intellij.ui.BooleanTableCellRenderer;
 import com.intellij.util.ui.ColumnInfo;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinFileType;
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo;
 
@@ -72,7 +72,7 @@ public class KotlinFunctionParameterTableModel extends KotlinCallableParameterTa
         private KotlinParameterInfo receiver;
 
         public ReceiverColumn(Project project, @Nullable KotlinMethodDescriptor methodDescriptor) {
-            super(KotlinRefactoringBundle.message("column.name.receiver"));
+            super(KotlinBundle.message("column.name.receiver"));
             this.project = project;
             this.receiver = methodDescriptor != null ? methodDescriptor.getReceiver() : null;
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java
index 61d8f2148b4..3d4d3c9d936 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase;
 import com.intellij.util.ui.ColumnInfo;
 import org.jetbrains.kotlin.idea.KotlinFileType;
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar;
@@ -47,7 +47,7 @@ public class KotlinPrimaryConstructorParameterTableModel extends KotlinCallableP
 
     protected static class ValVarColumn extends ColumnInfoBase<KotlinParameterInfo, ParameterTableModelItemBase<KotlinParameterInfo>, KotlinValVar> {
         public ValVarColumn() {
-            super(KotlinRefactoringBundle.message("column.name.val.var"));
+            super(KotlinBundle.message("column.name.val.var"));
         }
 
         @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationDialog.kt
index 5e3ea500ef7..1a28bf820e0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationDialog.kt
@@ -26,7 +26,7 @@ import com.intellij.util.ui.FormBuilder
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.kotlin.idea.core.getPackage
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.Pass
 import org.jetbrains.kotlin.idea.refactoring.hasIdentifiersOnly
 import org.jetbrains.kotlin.idea.refactoring.ui.KotlinDestinationFolderComboBox
@@ -143,7 +143,7 @@ class CopyKotlinDeclarationDialog(
         targetDirectory?.getTargetIfExists(defaultTargetDirectory)?.let {
             val targetFileName = newName + "." + originalFile.virtualFile.extension
             if (it.findFile(targetFileName) == originalFile) {
-                return KotlinRefactoringBundle.message("error.text.can.t.copy.class.to.the.containing.file")
+                return KotlinBundle.message("error.text.can.t.copy.class.to.the.containing.file")
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt
index c1f3969a3da..b78c078e3ab 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRe
 import org.jetbrains.kotlin.idea.core.getFqNameWithImplicitPrefix
 import org.jetbrains.kotlin.idea.core.packageMatchesDirectoryOrImplicit
 import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
 import org.jetbrains.kotlin.idea.refactoring.createKotlinFile
 import org.jetbrains.kotlin.idea.refactoring.move.*
@@ -126,8 +126,7 @@ class CopyKotlinDeclarationsHandler : CopyHandlerDelegateBase() {
         targetFileName: String,
         targetDirectory: PsiDirectory
     ): ExistingFilePolicy {
-        val message = KotlinRefactoringBundle.message(
-            "text.file.0.already.exists.in.1",
+        val message = KotlinBundle.message("text.file.0.already.exists.in.1",
             targetFileName,
             targetDirectory.virtualFile.path
         )
@@ -138,8 +137,8 @@ class CopyKotlinDeclarationsHandler : CopyHandlerDelegateBase() {
             val answer = Messages.showOkCancelDialog(
                 message,
                 commandName,
-                KotlinRefactoringBundle.message("action.text.overwrite"),
-                KotlinRefactoringBundle.message("action.text.cancel"),
+                KotlinBundle.message("action.text.overwrite"),
+                KotlinBundle.message("action.text.cancel"),
                 Messages.getQuestionIcon()
             )
             if (answer == Messages.OK) ExistingFilePolicy.OVERWRITE else ExistingFilePolicy.SKIP
@@ -149,9 +148,9 @@ class CopyKotlinDeclarationsHandler : CopyHandlerDelegateBase() {
             val answer = Messages.showYesNoCancelDialog(
                 message,
                 commandName,
-                KotlinRefactoringBundle.message("action.text.append"),
-                KotlinRefactoringBundle.message("action.text.overwrite"),
-                KotlinRefactoringBundle.message("action.text.cancel"),
+                KotlinBundle.message("action.text.append"),
+                KotlinBundle.message("action.text.overwrite"),
+                KotlinBundle.message("action.text.cancel"),
                 Messages.getQuestionIcon()
             )
             when (answer) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsIntentionAction.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsIntentionAction.kt
index 05fffdea2cd..0ae543a0311 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsIntentionAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/cutPaste/MoveDeclarationsIntentionAction.kt
@@ -17,7 +17,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.refactoring.BaseRefactoringIntentionAction
 import org.jetbrains.kotlin.idea.core.util.range
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 
 class MoveDeclarationsIntentionAction(
     private val processor: MoveDeclarationsProcessor,
@@ -27,12 +27,11 @@ class MoveDeclarationsIntentionAction(
 
     override fun startInWriteAction() = false
 
-    override fun getText() = KotlinRefactoringBundle.message(
-        "text.update.usages.to.reflect.declaration.0.move",
+    override fun getText() = KotlinBundle.message("text.update.usages.to.reflect.declaration.0.move",
         processor.pastedDeclarations.size
     )
 
-    override fun getFamilyName() = KotlinRefactoringBundle.message("family.name.update.usages.on.declarations.cut.paste")
+    override fun getFamilyName() = KotlinBundle.message("family.name.update.usages.on.declarations.cut.paste")
 
     override fun isAvailable(project: Project, editor: Editor, element: PsiElement): Boolean {
         return PsiModificationTracker.SERVICE.getInstance(processor.project).modificationCount == modificationCount
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
index 1e75a8a2a32..276f9bf67be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
@@ -29,6 +29,7 @@ import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.ui.components.JBList
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
 import org.jetbrains.kotlin.idea.refactoring.introduce.findExpressionOrStringFragment
@@ -186,7 +187,8 @@ private fun smartSelectElement(
 ) {
     val elements = elementKinds.flatMap { getSmartSelectSuggestions(file, offset, it) }
     if (elements.isEmpty()) {
-        if (failOnEmptySuggestion) throw IntroduceRefactoringException(KotlinRefactoringBundle.message("cannot.refactor.not.expression"))
+        if (failOnEmptySuggestion) throw IntroduceRefactoringException(
+            KotlinBundle.message("cannot.refactor.not.expression"))
         callback(null)
         return
     }
@@ -279,7 +281,7 @@ private fun findElement(
         //todo: if it's infix expression => add (), then commit document then return new created expression
 
         if (failOnNoExpression) {
-            throw IntroduceRefactoringException(KotlinRefactoringBundle.message("cannot.refactor.not.expression"))
+            throw IntroduceRefactoringException(KotlinBundle.message("cannot.refactor.not.expression"))
         }
         return null
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt
index 0d28268af6c..f05d2722ce8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineDialog.kt
@@ -10,7 +10,7 @@ import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.ElementDescriptionUtil
 import com.intellij.refactoring.inline.InlineOptionsDialog
 import com.intellij.usageView.UsageViewTypeLocation
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 
@@ -30,7 +30,7 @@ abstract class AbstractKotlinInlineDialog(
 
     private val kind: String = ElementDescriptionUtil.getElementDescription(callable, UsageViewTypeLocation.INSTANCE)
 
-    private val refactoringName get() = KotlinRefactoringBundle.message("text.inline.0", StringUtil.capitalizeWords(kind, true))
+    private val refactoringName get() = KotlinBundle.message("text.inline.0", StringUtil.capitalizeWords(kind, true))
 
     init {
         myInvokedOnReference = reference != null
@@ -55,21 +55,20 @@ abstract class AbstractKotlinInlineDialog(
         return "${kind.capitalize()} ${callable.nameAsSafeName} $occurrencesString"
     }
 
-    private fun getInlineText(verb: String) = KotlinRefactoringBundle.message(
-        "text.inline.all.references.and.0.the.1",
+    private fun getInlineText(verb: String) = KotlinBundle.message("text.inline.all.references.and.0.the.1",
         verb,
         (occurrencesString?.let { "($it)" } ?: "")
     )
 
-    override fun getInlineAllText() = getInlineText(KotlinRefactoringBundle.message("text.remove"))
+    override fun getInlineAllText() = getInlineText(KotlinBundle.message("text.remove"))
 
     override fun getKeepTheDeclarationText(): String? =
         // With non-writable callable refactoring does not work anyway (for both property or function)
         if (callable.isWritable && (occurrencesNumber > 1 || !myInvokedOnReference)) {
-            getInlineText(KotlinRefactoringBundle.message("text.keep"))
+            getInlineText(KotlinBundle.message("text.keep"))
         } else {
             null
         }
 
-    override fun getInlineThisText() = KotlinRefactoringBundle.message("text.inline.this.reference.and.keep.the.0", kind)
+    override fun getInlineThisText() = KotlinBundle.message("text.inline.this.reference.and.keep.the.0", kind)
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineCallableProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineCallableProcessor.kt
index 6a045a9351b..b56a405341d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineCallableProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineCallableProcessor.kt
@@ -28,7 +28,7 @@ import com.intellij.usageView.UsageViewDescriptor
 import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
 import org.jetbrains.kotlin.idea.codeInliner.replaceUsages
 import org.jetbrains.kotlin.idea.findUsages.ReferencesSearchScopeHelper
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.pullUp.deleteWithCompanion
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -46,16 +46,15 @@ class KotlinInlineCallableProcessor(
 ) : BaseRefactoringProcessor(project) {
 
     private val kind = when (declaration) {
-        is KtNamedFunction -> KotlinRefactoringBundle.message("text.function")
+        is KtNamedFunction -> KotlinBundle.message("text.function")
         is KtProperty -> if (declaration.isLocal)
-            KotlinRefactoringBundle.message("text.local.variable")
+            KotlinBundle.message("text.local.variable")
         else
-            KotlinRefactoringBundle.message("text.local.property")
-        else -> KotlinRefactoringBundle.message("text.declaration")
+            KotlinBundle.message("text.local.property")
+        else -> KotlinBundle.message("text.declaration")
     }
 
-    private val commandName = KotlinRefactoringBundle.message(
-        "text.inlining.0.1",
+    private val commandName = KotlinBundle.message("text.inlining.0.1",
         kind,
         DescriptiveNameUtil.getDescriptiveName(declaration)
     )
@@ -85,12 +84,11 @@ class KotlinInlineCallableProcessor(
                         CommonRefactoringUtil.showErrorHint(
                             declaration.project,
                             null,
-                            KotlinRefactoringBundle.message(
-                                "text.cannot.inline.0.1.usages",
+                            KotlinBundle.message("text.cannot.inline.0.1.usages",
                                 usages.size - simpleNameUsages.size,
                                 usages.size
                             ),
-                            KotlinRefactoringBundle.message("text.inline.0", kind),
+                            KotlinBundle.message("text.inline.0", kind),
                             null
                         )
                     }
@@ -112,7 +110,7 @@ class KotlinInlineCallableProcessor(
 
             override fun getElements() = arrayOf(declaration)
 
-            override fun getProcessedElementsHeader() = KotlinRefactoringBundle.message("text.0.to.inline", kind.capitalize())
+            override fun getProcessedElementsHeader() = KotlinBundle.message("text.0.to.inline", kind.capitalize())
         }
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
index 2f7c4d7376d..33757d58b76 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.codeInliner.CallableUsageReplacementStrategy
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
@@ -39,10 +39,10 @@ class KotlinInlineFunctionHandler : InlineActionHandler() {
         val recursive = element.isRecursive()
         if (recursive && nameReference == null) {
             val message = RefactoringBundle.getCannotRefactorMessage(
-                KotlinRefactoringBundle.message("text.inline.recursive.function.is.supported.only.on.references")
+                KotlinBundle.message("text.inline.recursive.function.is.supported.only.on.references")
             )
 
-            CommonRefactoringUtil.showErrorHint(project, editor, message, KotlinRefactoringBundle.message("title.inline.function"), null)
+            CommonRefactoringUtil.showErrorHint(project, editor, message, KotlinBundle.message("title.inline.function"), null)
             return
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt
index 85d1a76e4ed..6e77f9ad1ea 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineTypeAliasHandler.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.types.Variance
 
 class KotlinInlineTypeAliasHandler : InlineActionHandler() {
     companion object {
-        val REFACTORING_NAME = KotlinRefactoringBundle.message("name.inline.type.alias")
+        val REFACTORING_NAME = KotlinBundle.message("name.inline.type.alias")
     }
 
     private fun showErrorHint(project: Project, editor: Editor?, message: String) {
@@ -70,7 +70,7 @@ class KotlinInlineTypeAliasHandler : InlineActionHandler() {
         if (usages.isEmpty()) return showErrorHint(
             project,
             editor,
-            KotlinRefactoringBundle.message("message.text.type.alias.0.is.never.used", name)
+            KotlinBundle.message("message.text.type.alias.0.is.never.used", name)
         )
 
         val usagesInOriginalFile = usages.filter { it.containingFile == file }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt
index 9b42a6e513d..a45541743d2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValDialog.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 import com.intellij.openapi.help.HelpManager
 import com.intellij.refactoring.HelpID
 import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.psi.KtBinaryExpression
@@ -53,7 +53,7 @@ class KotlinInlineValDialog(
 
                 override fun shouldSaveOptionsOnCancel() = false
 
-                override fun getDoNotShowMessage() = KotlinRefactoringBundle.message("message.do.not.show.for.local.variables.in.future")
+                override fun getDoNotShowMessage() = KotlinBundle.message("message.do.not.show.for.local.variables.in.future")
             })
         }
         init()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
index 71f85688549..1d405743760 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.codeInliner.CodeToInline
 import org.jetbrains.kotlin.idea.codeInliner.PropertyUsageReplacementStrategy
 import org.jetbrains.kotlin.idea.findUsages.ReferencesSearchScopeHelper
 import org.jetbrains.kotlin.idea.project.builtIns
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
 import org.jetbrains.kotlin.idea.references.ReferenceAccess
 import org.jetbrains.kotlin.idea.references.readWriteAccess
@@ -65,7 +65,7 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
             return showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("error.hint.text.cannot.inline.0.from.a.decompiled.file", name)
+                KotlinBundle.message("error.hint.text.cannot.inline.0.from.a.decompiled.file", name)
             )
         }
 
@@ -76,7 +76,7 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
             return showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("cannot.inline.property.with.accessor.s.and.backing.field")
+                KotlinBundle.message("cannot.inline.property.with.accessor.s.and.backing.field")
             )
         }
 
@@ -84,10 +84,10 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
 
         if (referenceExpressions.isEmpty() && conflicts.isEmpty) {
             val kind = if (declaration.isLocal)
-                KotlinRefactoringBundle.message("text.variable")
+                KotlinBundle.message("text.variable")
             else
-                KotlinRefactoringBundle.message("text.property")
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("0.1.is.never.used", kind.capitalize(), name))
+                KotlinBundle.message("text.property")
+            return showErrorHint(project, editor, KotlinBundle.message("0.1.is.never.used", kind.capitalize(), name))
         }
 
         val referencesInOriginalFile = referenceExpressions.filter { it.containingFile == file }
@@ -117,14 +117,13 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
         if (!conflicts.isEmpty) {
             val conflictsCopy = conflicts.copy()
             val allOrSome = if (referenceExpressions.isEmpty())
-                KotlinRefactoringBundle.message("text.all")
+                KotlinBundle.message("text.all")
             else
-                KotlinRefactoringBundle.message("text.the.following")
+                KotlinBundle.message("text.the.following")
 
             conflictsCopy.putValue(
                 null,
-                KotlinRefactoringBundle.message(
-                    "0.usages.are.not.supported.by.the.inline.refactoring.they.won.t.be.processed",
+                KotlinBundle.message("0.usages.are.not.supported.by.the.inline.refactoring.they.won.t.be.processed",
                     allOrSome
                 )
             )
@@ -146,7 +145,7 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
         for (ref in references) {
             val refElement = ref.element
             if (refElement !is KtElement) {
-                conflictUsages.putValue(refElement, KotlinRefactoringBundle.message("non.kotlin.usage.0", refElement.text))
+                conflictUsages.putValue(refElement, KotlinBundle.message("non.kotlin.usage.0", refElement.text))
                 continue
             }
 
@@ -154,7 +153,7 @@ class KotlinInlineValHandler(private val withPrompt: Boolean) : InlineActionHand
             //TODO: what if null?
             if (expression != null) {
                 if (expression.readWriteAccess(useResolveForReadWrite = true) == ReferenceAccess.READ_WRITE) {
-                    conflictUsages.putValue(expression, KotlinRefactoringBundle.message("unsupported.usage.0", expression.parent.text))
+                    conflictUsages.putValue(expression, KotlinBundle.message("unsupported.usage.0", expression.parent.text))
                 }
                 referenceExpressions.add(expression)
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/inlineUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/inlineUtils.kt
index ac5edb92a1e..bdd58ae6565 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/inlineUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/inlineUtils.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.codeInliner.CodeToInline
 import org.jetbrains.kotlin.idea.codeInliner.CodeToInlineBuilder
 import org.jetbrains.kotlin.idea.core.copied
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.move.ContainerChangeInfo
 import org.jetbrains.kotlin.idea.refactoring.move.ContainerInfo
 import org.jetbrains.kotlin.idea.refactoring.move.postProcessMoveUsages
@@ -65,15 +65,15 @@ fun showDialog(
 
     val kind = when (declaration) {
         is KtProperty -> if (declaration.isLocal)
-            KotlinRefactoringBundle.message("text.local.variable")
+            KotlinBundle.message("text.local.variable")
         else
-            KotlinRefactoringBundle.message("text.local.property")
-        is KtTypeAlias -> KotlinRefactoringBundle.message("text.type.alias")
+            KotlinBundle.message("text.local.property")
+        is KtTypeAlias -> KotlinBundle.message("text.type.alias")
         else -> return false
     }
     val dialog = RefactoringMessageDialog(
         title,
-        KotlinRefactoringBundle.message("text.inline.0.1.2", kind, name, RefactoringBundle.message("occurences.string", usages.size)),
+        KotlinBundle.message("text.inline.0.1.2", kind, name, RefactoringBundle.message("occurences.string", usages.size)),
         helpTopic,
         "OptionPane.questionIcon",
         true,
@@ -148,16 +148,16 @@ internal fun buildCodeToInline(
         if (returnStatements.any { it != lastReturn }) {
             val message = RefactoringBundle.getCannotRefactorMessage(
                 if (returnStatements.size > 1)
-                    KotlinRefactoringBundle.message("error.text.inline.function.is.not.supported.for.functions.with.multiple.return.statements")
+                    KotlinBundle.message("error.text.inline.function.is.not.supported.for.functions.with.multiple.return.statements")
                 else
-                    KotlinRefactoringBundle.message("error.text.inline.function.is.not.supported.for.functions.with.return.statements.not.at.the.end.of.the.body")
+                    KotlinBundle.message("error.text.inline.function.is.not.supported.for.functions.with.return.statements.not.at.the.end.of.the.body")
             )
 
             CommonRefactoringUtil.showErrorHint(
                 declaration.project,
                 editor,
                 message,
-                KotlinRefactoringBundle.message("title.inline.function"),
+                KotlinBundle.message("title.inline.function"),
                 null
             )
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
index a23ac1e6241..452f1584a20 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests
 import org.jetbrains.kotlin.idea.core.*
 import org.jetbrains.kotlin.idea.core.util.runSynchronouslyWithProgress
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.insertDeclaration
 import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo
 import org.jetbrains.kotlin.idea.refactoring.memberInfo.getChildrenToAnalyze
@@ -137,8 +137,7 @@ class ExtractSuperRefactoring(
                     ?.let {
                         conflicts.putValue(
                             it,
-                            KotlinRefactoringBundle.message(
-                                "text.class.0.already.exists.in.the.target.scope",
+                            KotlinBundle.message("text.class.0.already.exists.in.the.target.scope",
                                 newClassName
                             )
                         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractInterfaceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractInterfaceHandler.kt
index 55e0a682abc..e2ab031e1fd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractInterfaceHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractInterfaceHandler.kt
@@ -17,18 +17,18 @@
 package org.jetbrains.kotlin.idea.refactoring.introduce.extractClass
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ui.KotlinExtractInterfaceDialog
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
 object KotlinExtractInterfaceHandler : KotlinExtractSuperHandlerBase(true) {
-    val REFACTORING_NAME = KotlinRefactoringBundle.message("name.extract.interface")
+    val REFACTORING_NAME = KotlinBundle.message("name.extract.interface")
 
     override fun getErrorMessage(klass: KtClassOrObject): String? {
         val superMessage = super.getErrorMessage(klass)
         if (superMessage != null) return superMessage
-        if (klass is KtClass && klass.isAnnotation()) return KotlinRefactoringBundle.message("error.text.interface.cannot.be.extracted.from.an.annotation.class")
+        if (klass is KtClass && klass.isAnnotation()) return KotlinBundle.message("error.text.interface.cannot.be.extracted.from.an.annotation.class")
         return null
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
index ba7ddee49c9..76a93777fbb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
@@ -31,6 +31,7 @@ import com.intellij.refactoring.extractSuperclass.ExtractSuperClassUtil
 import com.intellij.refactoring.lang.ElementsHandler
 import com.intellij.refactoring.util.CommonRefactoringUtil
 import org.jetbrains.kotlin.asJava.toLightClass
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ui.KotlinExtractSuperDialogBase
 import org.jetbrains.kotlin.idea.util.isExpectDeclaration
@@ -90,9 +91,9 @@ abstract class KotlinExtractSuperHandlerBase(private val isExtractInterface: Boo
             containers,
             editor,
             if (containers.first() is KtFile)
-                KotlinRefactoringBundle.message("text.select.target.file")
+                KotlinBundle.message("text.select.target.file")
             else
-                KotlinRefactoringBundle.message("text.select.target.code.block.file"),
+                KotlinBundle.message("text.select.target.code.block.file"),
             true,
             { it },
             { doInvoke(klass, if (it is SeparateFileWrapper) klass.containingFile.parent!! else it) }
@@ -111,8 +112,8 @@ abstract class KotlinExtractSuperHandlerBase(private val isExtractInterface: Boo
     }
 
     internal open fun getErrorMessage(klass: KtClassOrObject): String? = when {
-        klass.isExpectDeclaration() -> KotlinRefactoringBundle.message("error.text.extraction.from.expect.class.is.not.yet.supported")
-        klass.toLightClass() == null -> KotlinRefactoringBundle.message("error.text.extraction.from.non.jvm.class.is.not.yet.supported")
+        klass.isExpectDeclaration() -> KotlinBundle.message("error.text.extraction.from.expect.class.is.not.yet.supported")
+        klass.toLightClass() == null -> KotlinBundle.message("error.text.extraction.from.non.jvm.class.is.not.yet.supported")
         else -> null
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperclassHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperclassHandler.kt
index 0e7c28b9471..825df33a79b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperclassHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperclassHandler.kt
@@ -18,13 +18,13 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractClass
 
 import com.intellij.psi.PsiElement
 import com.intellij.refactoring.RefactoringBundle
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ui.KotlinExtractSuperclassDialog
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
 object KotlinExtractSuperclassHandler : KotlinExtractSuperHandlerBase(false) {
-    val REFACTORING_NAME = KotlinRefactoringBundle.message("text.extract.superclass")
+    val REFACTORING_NAME = KotlinBundle.message("text.extract.superclass")
 
     override fun getErrorMessage(klass: KtClassOrObject): String? {
         val superMessage = super.getErrorMessage(klass)
@@ -32,7 +32,7 @@ object KotlinExtractSuperclassHandler : KotlinExtractSuperHandlerBase(false) {
         if (klass is KtClass) {
             if (klass.isInterface()) return RefactoringBundle.message("superclass.cannot.be.extracted.from.an.interface")
             if (klass.isEnum()) return RefactoringBundle.message("superclass.cannot.be.extracted.from.an.enum")
-            if (klass.isAnnotation()) return KotlinRefactoringBundle.message("error.text.superclass.cannot.be.extracted.from.an.annotation.class")
+            if (klass.isAnnotation()) return KotlinBundle.message("error.text.superclass.cannot.be.extracted.from.an.annotation.class")
         }
         return null
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
index 7fbfb2e33a5..881ddc4d28d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.unquote
 import org.jetbrains.kotlin.idea.core.util.onTextChange
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ExtractSuperInfo
 import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo
 import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel
@@ -99,7 +99,7 @@ abstract class KotlinExtractSuperDialogBase(
 
     protected abstract fun createMemberInfoModel(): MemberInfoModelBase
 
-    override fun getDocCommentPanelName() = KotlinRefactoringBundle.message("name.kdoc.for.abstracts")
+    override fun getDocCommentPanelName() = KotlinBundle.message("name.kdoc.for.abstracts")
 
     override fun checkConflicts() = conflictChecker(this)
 
@@ -117,7 +117,7 @@ abstract class KotlinExtractSuperDialogBase(
         val targetDirectoryPanel = super.createDestinationRootPanel()
         val targetFileNamePanel = JPanel(BorderLayout()).apply {
             border = BorderFactory.createEmptyBorder(10, 0, 0, 0)
-            val label = JBLabel(KotlinRefactoringBundle.message("label.text.target.file.name"))
+            val label = JBLabel(KotlinBundle.message("label.text.target.file.name"))
             add(label, BorderLayout.NORTH)
             label.labelFor = fileNameField
             add(fileNameField, BorderLayout.CENTER)
@@ -175,7 +175,7 @@ abstract class KotlinExtractSuperDialogBase(
     override fun validateName(name: String): String? {
         return when {
             !name.quoteIfNeeded().isIdentifier() -> RefactoringMessageUtil.getIncorrectIdentifierMessage(name)
-            name.unquote() == mySourceClass.name -> KotlinRefactoringBundle.message("error.text.different.name.expected")
+            name.unquote() == mySourceClass.name -> KotlinBundle.message("error.text.different.name.expected")
             else -> null
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
index 0f69ba6b347..e43a3895872 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.refactoring.RefactoringActionHandler
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
@@ -69,7 +69,7 @@ class ExtractKotlinFunctionHandler(
             EXTRACT_FUNCTION,
             editor,
             file,
-            KotlinRefactoringBundle.message("title.select.target.code.block"),
+            KotlinBundle.message("title.select.target.code.block"),
             listOf(CodeInsightUtils.ElementKind.EXPRESSION),
             ::validateExpressionElements,
             { elements, parent -> parent.getExtractionContainers(elements.size == 1, allContainersEnabled) },
@@ -87,4 +87,4 @@ class ExtractKotlinFunctionHandler(
     }
 }
 
-val EXTRACT_FUNCTION: String = KotlinRefactoringBundle.message("extract.function")
+val EXTRACT_FUNCTION: String = KotlinBundle.message("extract.function")
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/ExtractFunctionParameterTablePanel.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/ExtractFunctionParameterTablePanel.kt
index 6a680f3fe63..a02f4ae8c01 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/ExtractFunctionParameterTablePanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/ExtractFunctionParameterTablePanel.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui
 import com.intellij.ui.components.JBComboBoxLabel
 import com.intellij.ui.components.editors.JBComboBoxTableCellEditorComponent
 import com.intellij.util.ui.AbstractTableCellEditor
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.Parameter
 import org.jetbrains.kotlin.idea.refactoring.introduce.ui.AbstractParameterTablePanel
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
@@ -29,7 +29,7 @@ open class ExtractFunctionParameterTablePanel : AbstractParameterTablePanel<Para
         var type = originalParameter.parameterType
 
         init {
-            name = if (isReceiver) KotlinRefactoringBundle.message("text.receiver") else originalParameter.name
+            name = if (isReceiver) KotlinBundle.message("text.receiver") else originalParameter.name
         }
 
         override fun toParameter() = originalParameter.copy(name, type)
@@ -39,7 +39,7 @@ open class ExtractFunctionParameterTablePanel : AbstractParameterTablePanel<Para
 
     override fun createAdditionalColumns() {
         with(table.columnModel.getColumn(PARAMETER_TYPE_COLUMN)) {
-            headerValue = KotlinRefactoringBundle.message("text.type")
+            headerValue = KotlinBundle.message("text.type")
             cellRenderer = object : DefaultTableCellRenderer() {
                 private val myLabel = JBComboBoxLabel()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
index c2028bb4a10..08e91cad81b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java
@@ -22,7 +22,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.refactoring.ui.NameSuggestionsField;
 import com.intellij.ui.TitledSeparator;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -30,7 +29,7 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinFileType;
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt;
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*;
 import org.jetbrains.kotlin.idea.refactoring.introduce.ui.KotlinSignatureComponent;
@@ -79,7 +78,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
         this.onAccept = onAccept;
 
         setModal(true);
-        setTitle(KotlinRefactoringBundle.message("extract.function"));
+        setTitle(KotlinBundle.message("extract.function"));
         init();
         update();
     }
@@ -212,7 +211,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper {
         };
         parameterTablePanel.init(extractableCodeDescriptor.getReceiverParameter(), extractableCodeDescriptor.getParameters());
 
-        inputParametersPanel.setText(KotlinRefactoringBundle.message("text.parameters"));
+        inputParametersPanel.setText(KotlinBundle.message("text.parameters"));
         inputParametersPanel.setLabelFor(parameterTablePanel.getTable());
         inputParametersPanel.add(parameterTablePanel);
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index 18727e44ac6..387c58a6a30 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.*
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference.ShorteningMode
 import org.jetbrains.kotlin.idea.references.mainReference
@@ -401,17 +401,17 @@ fun ExtractableCodeDescriptor.copy(
 }
 
 enum class ExtractionTarget(val targetName: String) {
-    FUNCTION(KotlinRefactoringBundle.message("text.function")) {
+    FUNCTION(KotlinBundle.message("text.function")) {
         override fun isAvailable(descriptor: ExtractableCodeDescriptor) = true
     },
 
-    FAKE_LAMBDALIKE_FUNCTION(KotlinRefactoringBundle.message("text.lambda.parameter")) {
+    FAKE_LAMBDALIKE_FUNCTION(KotlinBundle.message("text.lambda.parameter")) {
         override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
             return checkSimpleControlFlow(descriptor) || descriptor.controlFlow.outputValues.isEmpty()
         }
     },
 
-    PROPERTY_WITH_INITIALIZER(KotlinRefactoringBundle.message("text.property.with.initializer")) {
+    PROPERTY_WITH_INITIALIZER(KotlinBundle.message("text.property.with.initializer")) {
         override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
             return checkSignatureAndParent(descriptor)
                     && checkSimpleControlFlow(descriptor)
@@ -421,13 +421,13 @@ enum class ExtractionTarget(val targetName: String) {
         }
     },
 
-    PROPERTY_WITH_GETTER(KotlinRefactoringBundle.message("text.property.with.getter")) {
+    PROPERTY_WITH_GETTER(KotlinBundle.message("text.property.with.getter")) {
         override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
             return checkSignatureAndParent(descriptor)
         }
     },
 
-    LAZY_PROPERTY(KotlinRefactoringBundle.message("text.lazy.property")) {
+    LAZY_PROPERTY(KotlinBundle.message("text.lazy.property")) {
         override fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean {
             return checkSignatureAndParent(descriptor)
                     && checkSimpleControlFlow(descriptor)
@@ -528,7 +528,7 @@ class AnalysisResult(
         }
 
         fun renderMessage(): String {
-            val message = KotlinRefactoringBundle.message(
+            val message = KotlinBundle.message(
                 when (this) {
                     NO_EXPRESSION -> "cannot.refactor.no.expression"
                     NO_CONTAINER -> "cannot.refactor.no.container"
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
index 4ca803b1712..bce78d01268 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
@@ -25,7 +25,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.util.Computable
 import com.intellij.refactoring.BaseRefactoringProcessor
 import com.intellij.ui.awt.RelativePoint
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
 import org.jetbrains.kotlin.idea.refactoring.introduce.showErrorHint
 import org.jetbrains.kotlin.idea.util.ProgressIndicatorUtils
@@ -96,7 +96,7 @@ class ExtractionEngine(
                 )
                 JBPopupFactory.getInstance()!!
                     .createHtmlTextBalloonBuilder(
-                        "$message<br/><br/><a href=\"EXTRACT\">${KotlinRefactoringBundle.message("text.proceed.with.extraction")}</a>",
+                        "$message<br/><br/><a href=\"EXTRACT\">${KotlinBundle.message("text.proceed.with.extraction")}</a>",
                         MessageType.WARNING
                     ) { event ->
                         if (event?.eventType == HyperlinkEvent.EventType.ACTIVATED) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
index d851d42c223..0828d6df6e5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
@@ -31,7 +31,7 @@ import com.intellij.openapi.ui.Messages
 import com.intellij.refactoring.RefactoringBundle
 import com.intellij.refactoring.util.duplicates.MethodDuplicatesHandler
 import com.intellij.ui.ReplacePromptDialog
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.getPhysicalTextRange
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
@@ -84,14 +84,13 @@ fun processDuplicates(
     } else {
         Messages.showYesNoDialog(
             project,
-            KotlinRefactoringBundle.message(
-                "0.has.detected.1.code.fragments.in.2.that.can.be.replaced.with.3",
+            KotlinBundle.message("0.has.detected.1.code.fragments.in.2.that.can.be.replaced.with.3",
                 ApplicationNamesInfo.getInstance().productName,
                 duplicateReplacers.size,
                 scopeDescription,
                 usageDescription
             ),
-            KotlinRefactoringBundle.message("text.process.duplicates"),
+            KotlinBundle.message("text.process.duplicates"),
             Messages.getQuestionIcon()
         )
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
index 3c67ac1b92a..abd0c6c57ed 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator
 import org.jetbrains.kotlin.idea.core.compareDescriptors
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.createTempCopy
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status
@@ -763,7 +763,7 @@ internal fun KtNamedDeclaration.getGeneratedBody() =
 fun ExtractableCodeDescriptor.validate(target: ExtractionTarget = ExtractionTarget.FUNCTION): ExtractableCodeDescriptorWithConflicts {
     fun getDeclarationMessage(declaration: PsiElement, messageKey: String, capitalize: Boolean = true): String {
         val declarationStr = RefactoringUIUtil.getDescription(declaration, true)
-        val message = KotlinRefactoringBundle.message(messageKey, declarationStr)
+        val message = KotlinBundle.message(messageKey, declarationStr)
         return if (capitalize) message.capitalize() else message
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
index 313ef62ea1f..212bf1abb46 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.inspections.UseExpressionBodyInspection
 import org.jetbrains.kotlin.idea.intentions.InfixCallToOrdinaryIntention
 import org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention
 import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArgumentsIntention
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValueBoxer.AsTuple
@@ -48,8 +48,7 @@ import java.util.*
 private fun buildSignature(config: ExtractionGeneratorConfiguration, renderer: DescriptorRenderer): CallableBuilder {
     val extractionTarget = config.generatorOptions.target
     if (!extractionTarget.isAvailable(config.descriptor)) {
-        val message = KotlinRefactoringBundle.message(
-            "error.text.can.t.generate.0.1",
+        val message = KotlinBundle.message("error.text.can.t.generate.0.1",
             extractionTarget.targetName,
             config.descriptor.extractionData.codeFragmentText
         )
@@ -131,8 +130,7 @@ fun ExtractionGeneratorConfiguration.getDeclarationPattern(
     if (!extractionTarget.isAvailable(descriptor)) {
         throw BaseRefactoringProcessor.ConflictsInTestsException(
             listOf(
-                KotlinRefactoringBundle.message(
-                    "error.text.can.t.generate.0.1",
+                KotlinBundle.message("error.text.can.t.generate.0.1",
                     extractionTarget.targetName,
                     descriptor.extractionData.codeFragmentText
                 )
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt
index 310eba5e6ad..6f1026b7b77 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.core.moveCaret
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
 import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.selectElement
 import org.jetbrains.kotlin.idea.references.KtReference
 import org.jetbrains.kotlin.idea.references.findPsiDeclarations
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.kotlin.utils.checkWithAttachment
 
 object KotlinIntroduceImportAliasHandler : RefactoringActionHandler {
-    val REFACTORING_NAME = KotlinRefactoringBundle.message("name.introduce.import.alias")
+    val REFACTORING_NAME = KotlinBundle.message("name.introduce.import.alias")
 
     @get:TestOnly
     var suggestedImportAliasNames: Collection<String> = emptyList()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt
index 0c5a4c1086d..4481e41230b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt
@@ -19,7 +19,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.ui.JBColor
 import com.intellij.ui.NonFocusableCheckBox
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar
 import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractKotlinInplaceIntroducer
 import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer
@@ -161,7 +161,7 @@ class KotlinInplaceParameterIntroducer(
         initFormComponents {
             addComponent(previewComponent)
 
-            val defaultValueCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.introduce.default.value"))
+            val defaultValueCheckBox = NonFocusableCheckBox(KotlinBundle.message("checkbox.text.introduce.default.value"))
             defaultValueCheckBox.isSelected = descriptor.withDefaultValue
             defaultValueCheckBox.addActionListener {
                 descriptor = descriptor.copy(withDefaultValue = defaultValueCheckBox.isSelected)
@@ -171,7 +171,8 @@ class KotlinInplaceParameterIntroducer(
 
             val occurrenceCount = descriptor.occurrencesToReplace.size
             if (occurrenceCount > 1) {
-                val replaceAllCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount))
+                val replaceAllCheckBox = NonFocusableCheckBox(
+                    KotlinBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount))
                 replaceAllCheckBox.isSelected = true
                 addComponent(replaceAllCheckBox)
                 this@KotlinInplaceParameterIntroducer.replaceAllCheckBox = replaceAllCheckBox
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
index 78044cf2c32..164677b2fd8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt
@@ -15,7 +15,7 @@ import com.intellij.refactoring.ui.RefactoringDialog
 import com.intellij.ui.NonFocusableCheckBox
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.util.isMultiLine
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.ExtractFunctionParameterTablePanel
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
@@ -113,7 +113,7 @@ class KotlinIntroduceParameterDialog private constructor(
         gbConstraints.weightx = 0.0
         gbConstraints.weighty = 0.0
         gbConstraints.gridy = 0
-        val nameLabel = JLabel(KotlinRefactoringBundle.message("text.parameter.name"))
+        val nameLabel = JLabel(KotlinBundle.message("text.parameter.name"))
         nameLabel.labelFor = nameField
         panel.add(nameLabel, gbConstraints)
 
@@ -131,9 +131,9 @@ class KotlinIntroduceParameterDialog private constructor(
         gbConstraints.fill = GridBagConstraints.NONE
         val typeLabel = JLabel(
             if (lambdaExtractionDescriptor != null)
-                                   KotlinRefactoringBundle.message("text.lambda.return.type")
+                                   KotlinBundle.message("text.lambda.return.type")
                                else
-                KotlinRefactoringBundle.message("text.parameter.type")
+                KotlinBundle.message("text.parameter.type")
         )
         typeLabel.labelFor = typeField
         panel.add(typeLabel, gbConstraints)
@@ -164,7 +164,7 @@ class KotlinIntroduceParameterDialog private constructor(
             gbConstraints.gridx = 0
             gbConstraints.gridy++
             gbConstraints.fill = GridBagConstraints.NONE
-            val parametersLabel = JLabel(KotlinRefactoringBundle.message("text.lambda.parameters"))
+            val parametersLabel = JLabel(KotlinBundle.message("text.lambda.parameters"))
             parametersLabel.labelFor = parameterTablePanel
             panel.add(parametersLabel, gbConstraints)
 
@@ -183,7 +183,7 @@ class KotlinIntroduceParameterDialog private constructor(
         gbConstraints.gridwidth = 2
         gbConstraints.gridy++
 
-        val defaultValueCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("text.introduce.default.value"))
+        val defaultValueCheckBox = NonFocusableCheckBox(KotlinBundle.message("text.introduce.default.value"))
         defaultValueCheckBox.isSelected = descriptor.withDefaultValue
         defaultValueCheckBox.addActionListener { updateRemoveParamCheckBoxes() }
         panel.add(defaultValueCheckBox, gbConstraints)
@@ -194,7 +194,9 @@ class KotlinIntroduceParameterDialog private constructor(
 
         if (occurrenceCount > 1) {
             gbConstraints.gridy++
-            val replaceAllCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount))
+            val replaceAllCheckBox = NonFocusableCheckBox(
+                KotlinBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount)
+            )
             replaceAllCheckBox.isSelected = true
             replaceAllCheckBox.addActionListener { updateRemoveParamCheckBoxes() }
             panel.add(replaceAllCheckBox, gbConstraints)
@@ -207,10 +209,12 @@ class KotlinIntroduceParameterDialog private constructor(
 
         for (parameter in descriptor.parametersToRemove) {
             val removeWhat = if (parameter is KtParameter)
-                KotlinRefactoringBundle.message("text.parameter.0", parameter.name)
+                KotlinBundle.message("text.parameter.0", parameter.name.toString())
             else
-                KotlinRefactoringBundle.message("text.receiver")
-            val cb = NonFocusableCheckBox(KotlinRefactoringBundle.message("text.remove.0.no.longer.used", removeWhat))
+                KotlinBundle.message("text.receiver")
+            val cb = NonFocusableCheckBox(
+                KotlinBundle.message("text.remove.0.no.longer.used", removeWhat)
+            )
 
             removeParamsCheckBoxes[cb] = parameter
             cb.isSelected = true
@@ -225,8 +229,10 @@ class KotlinIntroduceParameterDialog private constructor(
 
     override fun canRun() {
         val psiFactory = KtPsiFactory(myProject)
-        psiFactory.createExpressionIfPossible(nameField.enteredName.quoteIfNeeded()).validateElement(KotlinRefactoringBundle.message("error.text.invalid.parameter.name"))
-        psiFactory.createTypeIfPossible(typeField.enteredName).validateElement(KotlinRefactoringBundle.message("error.text.invalid.parameter.type"))
+        psiFactory.createExpressionIfPossible(nameField.enteredName.quoteIfNeeded()).validateElement(
+            KotlinBundle.message("error.text.invalid.parameter.name"))
+        psiFactory.createTypeIfPossible(typeField.enteredName).validateElement(
+            KotlinBundle.message("error.text.invalid.parameter.type"))
     }
 
     override fun doAction() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 62b0ecb4413..76b8b68fac9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.*
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
 import org.jetbrains.kotlin.idea.core.util.runSynchronouslyWithProgress
 import org.jetbrains.kotlin.idea.refactoring.CompositeRefactoringRunner
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
@@ -177,7 +177,7 @@ fun selectNewParameterContext(
         operationName = INTRODUCE_PARAMETER,
         editor = editor,
         file = file,
-        title = KotlinRefactoringBundle.message("title.introduce.parameter.to.declaration"),
+        title = KotlinBundle.message("title.introduce.parameter.to.declaration"),
         elementKinds = listOf(CodeInsightUtils.ElementKind.EXPRESSION),
         elementValidator = ::validateExpressionElements,
         getContainers = { _, parent ->
@@ -222,13 +222,12 @@ open class KotlinIntroduceParameterHandler(
         }
 
         if (expressionType == null) {
-            showErrorHint(project, editor, KotlinRefactoringBundle.message("error.text.expression.has.no.type"), INTRODUCE_PARAMETER)
+            showErrorHint(project, editor, KotlinBundle.message("error.text.expression.has.no.type"), INTRODUCE_PARAMETER)
             return
         }
 
         if (expressionType.isUnit() || expressionType.isNothing()) {
-            val message = KotlinRefactoringBundle.message(
-                "cannot.introduce.parameter.of.0.type",
+            val message = KotlinBundle.message("cannot.introduce.parameter.of.0.type",
                 IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(expressionType)
             )
             showErrorHint(project, editor, message, INTRODUCE_PARAMETER)
@@ -381,7 +380,7 @@ open class KotlinIntroduceParameterHandler(
             showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("error.text.introduce.parameter.is.not.available.inside.of.annotation.entries"),
+                KotlinBundle.message("error.text.introduce.parameter.is.not.available.inside.of.annotation.entries"),
                 INTRODUCE_PARAMETER
             )
             return
@@ -390,7 +389,7 @@ open class KotlinIntroduceParameterHandler(
             showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("error.text.introduce.parameter.is.not.available.for.default.value"),
+                KotlinBundle.message("error.text.introduce.parameter.is.not.available.for.default.value"),
                 INTRODUCE_PARAMETER
             )
             return
@@ -427,7 +426,7 @@ private fun findInternalUsagesOfParametersAndReceiver(
 ): MultiMap<KtElement, KtElement>? {
     val usages = MultiMap<KtElement, KtElement>()
     val searchComplete = targetParent.project.runSynchronouslyWithProgress(
-        KotlinRefactoringBundle.message("searching.usages.of.0.parameter", targetParent.name),
+        KotlinBundle.message("searching.usages.of.0.parameter", targetParent.name.toString()),
         true
     ) {
         runReadAction {
@@ -518,7 +517,7 @@ open class KotlinIntroduceLambdaParameterHandler(
                 showErrorHint(
                     project,
                     editor,
-                    KotlinRefactoringBundle.message("error.text.can.t.introduce.lambda.parameter.for.this.expression"),
+                    KotlinBundle.message("error.text.can.t.introduce.lambda.parameter.for.this.expression"),
                     INTRODUCE_LAMBDA_PARAMETER
                 )
                 return
@@ -551,5 +550,5 @@ open class KotlinIntroduceLambdaParameterHandler(
     }
 }
 
-val INTRODUCE_PARAMETER: String = KotlinRefactoringBundle.message("name.introduce.parameter1")
-val INTRODUCE_LAMBDA_PARAMETER: String = KotlinRefactoringBundle.message("name.introduce.lambda.parameter")
+val INTRODUCE_PARAMETER: String = KotlinBundle.message("name.introduce.parameter1")
+val INTRODUCE_LAMBDA_PARAMETER: String = KotlinBundle.message("name.introduce.lambda.parameter")
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
index 70c882fd7dd..6abb74e4638 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
@@ -13,7 +13,7 @@ import com.intellij.openapi.util.Pass
 import com.intellij.psi.PsiElement
 import com.intellij.ui.NonFocusableCheckBox
 import com.intellij.ui.PopupMenuListenerAdapter
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionTarget
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.generateDeclaration
@@ -90,7 +90,7 @@ class KotlinInplacePropertyIntroducer(
                         this
                     }
 
-                    val propertyKindLabel = JLabel(KotlinRefactoringBundle.message("label.text.introduce.as"))
+                    val propertyKindLabel = JLabel(KotlinBundle.message("label.text.introduce.as"))
                     propertyKindLabel.labelFor = propertyKindComboBox
 
                     val panel = JPanel()
@@ -127,7 +127,8 @@ class KotlinInplacePropertyIntroducer(
         if (occurrenceCount > 1) {
             addPanelControl(
                 ControlWrapper {
-                    val replaceAllCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount))
+                    val replaceAllCheckBox = NonFocusableCheckBox(
+                        KotlinBundle.message("checkbox.text.replace.all.occurrences.0", occurrenceCount))
                     replaceAllCheckBox.isSelected = replaceAll
                     replaceAllCheckBox.addActionListener { replaceAll = replaceAllCheckBox.isSelected }
                     replaceAllCheckBox
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
index 124d6345602..cd6e72a8f31 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.refactoring.RefactoringActionHandler
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
 import org.jetbrains.kotlin.idea.refactoring.introduce.selectElementsWithTargetSibling
@@ -64,7 +64,7 @@ class KotlinIntroducePropertyHandler(
                 showErrorHint(
                     project,
                     editor,
-                    KotlinRefactoringBundle.message("error.text.can.t.introduce.property.for.this.expression"),
+                    KotlinBundle.message("error.text.can.t.introduce.property.for.this.expression"),
                     INTRODUCE_PROPERTY
                 )
             }
@@ -76,7 +76,7 @@ class KotlinIntroducePropertyHandler(
             INTRODUCE_PROPERTY,
             editor,
             file,
-            KotlinRefactoringBundle.message("title.select.target.code.block"),
+            KotlinBundle.message("title.select.target.code.block"),
             listOf(CodeInsightUtils.ElementKind.EXPRESSION),
             ::validateExpressionElements,
             { _, parent ->
@@ -134,4 +134,4 @@ class KotlinIntroducePropertyHandler(
     }
 }
 
-val INTRODUCE_PROPERTY: String = KotlinRefactoringBundle.message("introduce.property")
\ No newline at end of file
+val INTRODUCE_PROPERTY: String = KotlinBundle.message("introduce.property")
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
index 7dccac06743..c300b8ba2f9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/IntroduceTypeAliasHandler.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils.ElementKind.TYPE_CONSTRUCTOR
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils.ElementKind.TYPE_ELEMENT
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSupportProvider
 import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
 import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractIntroduceAction
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler {
     companion object {
         @JvmField
-        val REFACTORING_NAME = KotlinRefactoringBundle.message("name.introduce.type.alias")
+        val REFACTORING_NAME = KotlinBundle.message("name.introduce.type.alias")
 
         val INSTANCE = KotlinIntroduceTypeAliasHandler()
     }
@@ -47,7 +47,7 @@ open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler {
             REFACTORING_NAME,
             editor,
             file,
-            KotlinRefactoringBundle.message("title.select.target.code.block"),
+            KotlinBundle.message("title.select.target.code.block"),
             listOf(TYPE_ELEMENT, TYPE_CONSTRUCTOR),
             { null },
             { _, parent -> listOf(parent.containingFile) },
@@ -75,11 +75,10 @@ open class KotlinIntroduceTypeAliasHandler : RefactoringActionHandler {
 
         val errorMessage = when (elementToExtract) {
             is KtSimpleNameExpression -> {
-                if (!(isTypeConstructorReference(elementToExtract) || isDoubleColonReceiver(elementToExtract))) KotlinRefactoringBundle.message(
-                    "error.text.type.reference.is.expected"
+                if (!(isTypeConstructorReference(elementToExtract) || isDoubleColonReceiver(elementToExtract))) KotlinBundle.message("error.text.type.reference.is.expected"
                 ) else null
             }
-            !is KtTypeElement -> KotlinRefactoringBundle.message("error.text.no.type.to.refactor")
+            !is KtTypeElement -> KotlinBundle.message("error.text.no.type.to.refactor")
             else -> null
         }
         if (errorMessage != null) return showErrorHint(project, editor, errorMessage, REFACTORING_NAME)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/introduceTypeAliasImpl.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/introduceTypeAliasImpl.kt
index 22dd816967c..6dda5b0413b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/introduceTypeAliasImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/introduceTypeAliasImpl.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.core.CollectingNameValidator
 import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.core.compareDescriptors
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.insertDeclaration
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
@@ -111,7 +111,7 @@ fun IntroduceTypeAliasData.analyze(): IntroduceTypeAliasAnalysisResult {
     val typeParameters = (typeParameterNames zip brokenReferences).map { TypeParameter(it.first, groupedReferencesToExtract[it.second]) }
 
     if (typeParameters.any { it.typeReferenceInfos.any { info -> info.reference.typeElement == originalTypeElement } }) {
-        return IntroduceTypeAliasAnalysisResult.Error(KotlinRefactoringBundle.message("text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined"))
+        return IntroduceTypeAliasAnalysisResult.Error(KotlinBundle.message("text.type.alias.cannot.refer.to.types.which.aren.t.accessible.in.the.scope.where.it.s.defined"))
     }
 
     val descriptor = IntroduceTypeAliasDescriptor(this, "Dummy", null, typeParameters)
@@ -135,19 +135,19 @@ fun IntroduceTypeAliasDescriptor.validate(): IntroduceTypeAliasDescriptorWithCon
     val originalType = originalData.originalTypeElement
     when {
         name.isEmpty() ->
-            conflicts.putValue(originalType, KotlinRefactoringBundle.message("text.no.name.provided.for.type.alias"))
+            conflicts.putValue(originalType, KotlinBundle.message("text.no.name.provided.for.type.alias"))
         !name.isIdentifier() ->
-            conflicts.putValue(originalType, KotlinRefactoringBundle.message("text.type.alias.name.must.be.a.valid.identifier.0", name))
+            conflicts.putValue(originalType, KotlinBundle.message("text.type.alias.name.must.be.a.valid.identifier.0", name))
         originalData.getTargetScope().findClassifier(Name.identifier(name), NoLookupLocation.FROM_IDE) != null ->
-            conflicts.putValue(originalType, KotlinRefactoringBundle.message("text.type.already.exists.in.the.target.scope", name))
+            conflicts.putValue(originalType, KotlinBundle.message("text.type.already.exists.in.the.target.scope", name))
     }
 
     if (typeParameters.distinctBy { it.name }.size != typeParameters.size) {
-        conflicts.putValue(originalType, KotlinRefactoringBundle.message("text.type.parameter.names.must.be.distinct"))
+        conflicts.putValue(originalType, KotlinBundle.message("text.type.parameter.names.must.be.distinct"))
     }
 
     if (visibility != null && visibility !in originalData.getApplicableVisibilities()) {
-        conflicts.putValue(originalType, KotlinRefactoringBundle.message("text.0.is.not.allowed.in.the.target.context", visibility))
+        conflicts.putValue(originalType, KotlinBundle.message("text.0.is.not.allowed.in.the.target.context", visibility))
     }
 
     return IntroduceTypeAliasDescriptorWithConflicts(this, conflicts)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
index bca5d35d3dd..20b040117f3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.java
@@ -28,7 +28,7 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinFileType;
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtilKt;
 import org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias.IntroduceTypeAliasDescriptor;
 import org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias.IntroduceTypeAliasImplKt;
@@ -192,7 +192,7 @@ public class KotlinIntroduceTypeAliasDialog extends DialogWrapper {
             };
             parameterTablePanel.init(originalDescriptor.getTypeParameters());
 
-            inputParametersPanel.setText(KotlinRefactoringBundle.message("text.type.parameters"));
+            inputParametersPanel.setText(KotlinBundle.message("text.type.parameters"));
             inputParametersPanel.setLabelFor(parameterTablePanel.getTable());
             inputParametersPanel.add(parameterTablePanel);
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeParameter/KotlinIntroduceTypeParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeParameter/KotlinIntroduceTypeParameterHandler.kt
index 2f14b18dee8..3e4b23dc8c7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeParameter/KotlinIntroduceTypeParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeParameter/KotlinIntroduceTypeParameterHandler.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createTypeParameter.CreateTypeParameterByUnresolvedRefActionFactory
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createTypeParameter.CreateTypeParameterFromUsageFix
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createTypeParameter.getPossibleTypeParameterContainers
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractIntroduceAction
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.processDuplicates
 import org.jetbrains.kotlin.idea.refactoring.introduce.introduceTypeAlias.KotlinIntroduceTypeAliasHandler
@@ -54,14 +54,14 @@ import org.jetbrains.kotlin.utils.keysToMap
 
 object KotlinIntroduceTypeParameterHandler : RefactoringActionHandler {
     @JvmField
-    val REFACTORING_NAME = KotlinRefactoringBundle.message("introduce.type.parameter")
+    val REFACTORING_NAME = KotlinBundle.message("introduce.type.parameter")
 
     fun selectElements(editor: Editor, file: KtFile, continuation: (elements: List<PsiElement>, targetParent: PsiElement) -> Unit) {
         selectElementsWithTargetParent(
             REFACTORING_NAME,
             editor,
             file,
-            KotlinRefactoringBundle.message("introduce.type.parameter.to.declaration"),
+            KotlinBundle.message("introduce.type.parameter.to.declaration"),
             listOf(CodeInsightUtils.ElementKind.TYPE_ELEMENT),
             { null },
             { _, parent -> getPossibleTypeParameterContainers(parent) },
@@ -75,7 +75,7 @@ object KotlinIntroduceTypeParameterHandler : RefactoringActionHandler {
             elements.singleOrNull() as? KtTypeElement ?: return showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("error.text.no.type.to.refactor"),
+                KotlinBundle.message("error.text.no.type.to.refactor"),
                 REFACTORING_NAME
             )
 
@@ -99,7 +99,7 @@ object KotlinIntroduceTypeParameterHandler : RefactoringActionHandler {
             } ?: return showErrorHint(
                 project,
                 editor,
-                KotlinRefactoringBundle.message("error.text.refactoring.is.not.applicable.in.the.current.context"),
+                KotlinBundle.message("error.text.refactoring.is.not.applicable.in.the.current.context"),
                 REFACTORING_NAME
             )
 
@@ -145,7 +145,7 @@ object KotlinIntroduceTypeParameterHandler : RefactoringActionHandler {
                         restoredOwner,
                         UsageViewTypeLocation.INSTANCE
                     ) + " '${restoredOwner.name}'",
-                    KotlinRefactoringBundle.message("description.a.reference.to.extracted.type.parameter")
+                    KotlinBundle.message("description.a.reference.to.extracted.type.parameter")
                 )
 
                 restoredTypeParameter.extendsBound?.let {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
index 257412aeea4..16a847d12ad 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.chooseContainerElementIfNecessary
 import org.jetbrains.kotlin.idea.refactoring.selectElement
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
@@ -38,7 +38,7 @@ fun showErrorHint(project: Project, editor: Editor, message: String, title: Stri
 }
 
 fun showErrorHintByKey(project: Project, editor: Editor, messageKey: String, title: String) {
-    showErrorHint(project, editor, KotlinRefactoringBundle.message(messageKey), title)
+    showErrorHint(project, editor, KotlinBundle.message(messageKey), title)
 }
 
 fun selectElementsWithTargetSibling(
@@ -125,7 +125,7 @@ fun selectElementsWithTargetParent(
                 else -> showErrorHint(
                     file.project,
                     editor,
-                    KotlinRefactoringBundle.message("text.refactoring.can.t.be.performed.on.the.selected.code.element"),
+                    KotlinBundle.message("text.refactoring.can.t.be.performed.on.the.selected.code.element"),
                     title
                 )
             }
@@ -251,7 +251,7 @@ fun <T : KtDeclaration> insertDeclaration(declaration: T, targetSibling: PsiElem
 
 internal fun validateExpressionElements(elements: List<PsiElement>): String? {
     if (elements.any { it is KtConstructor<*> || it is KtParameter || it is KtTypeAlias || it is KtPropertyAccessor }) {
-        return KotlinRefactoringBundle.message("text.refactoring.is.not.applicable.to.this.code.fragment")
+        return KotlinBundle.message("text.refactoring.is.not.applicable.to.this.code.fragment")
     }
     return null
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
index ac2c1522c4f..ec19a097a93 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
@@ -30,7 +30,7 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention;
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.references.ReferenceUtilKt;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.lexer.KtTokens;
@@ -203,7 +203,7 @@ public class KotlinInplaceVariableIntroducer<D extends KtCallableDeclaration> ex
             @Override
             public JComponent invoke() {
                 final JCheckBox exprTypeCheckbox = new NonFocusableCheckBox(
-                        KotlinRefactoringBundle.message("checkbox.text.specify.type.explicitly"));
+                        KotlinBundle.message("checkbox.text.specify.type.explicitly"));
                 exprTypeCheckbox.setSelected(false);
                 exprTypeCheckbox.addActionListener(new ActionListener() {
                     @Override
@@ -238,7 +238,7 @@ public class KotlinInplaceVariableIntroducer<D extends KtCallableDeclaration> ex
         return new Function0<JComponent>() {
             @Override
             public JComponent invoke() {
-                final JCheckBox varCheckbox = new NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.declare.with.var"));
+                final JCheckBox varCheckbox = new NonFocusableCheckBox(KotlinBundle.message("checkbox.text.declare.with.var"));
                 varCheckbox.setSelected(isVar);
                 varCheckbox.addActionListener(new ActionListener() {
                     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
index f6c70f93e49..b7a384facdb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
@@ -25,6 +25,7 @@ import com.intellij.util.SmartList
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.analysis.computeTypeInfoInContext
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
@@ -63,7 +64,7 @@ import java.util.*
 import kotlin.math.min
 
 object KotlinIntroduceVariableHandler : RefactoringActionHandler {
-    val INTRODUCE_VARIABLE = KotlinRefactoringBundle.message("introduce.variable")
+    val INTRODUCE_VARIABLE = KotlinBundle.message("introduce.variable")
 
     private val EXPRESSION_KEY = Key.create<Boolean>("EXPRESSION_KEY")
     private val REPLACE_KEY = Key.create<Boolean>("REPLACE_KEY")
@@ -475,13 +476,13 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
         when {
             parent is KtQualifiedExpression -> {
                 if (parent.receiverExpression != physicalExpression) {
-                    return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression"))
+                    return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.expression"))
                 }
             }
             physicalExpression is KtStatementExpression ->
-                return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression"))
+                return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.expression"))
             parent is KtOperationExpression && parent.operationReference == physicalExpression ->
-                return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression"))
+                return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.expression"))
         }
 
         PsiTreeUtil.getNonStrictParentOfType(
@@ -492,7 +493,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
             KtConstructorDelegationReferenceExpression::class.java,
             KtAnnotationEntry::class.java
         )?.let {
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.container"))
+            return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.container"))
         }
 
         val expressionType = substringInfo?.type ?: bindingContext.getType(physicalExpression) //can be null or error type
@@ -507,11 +508,11 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
                 && !TypeCheckerImpl(project).equalTypes(expressionType, typeNoExpectedType)
 
         if (expressionType == null && bindingContext.get(BindingContext.QUALIFIER, physicalExpression) != null) {
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.package.expression"))
+            return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.package.expression"))
         }
 
         if (expressionType != null && KotlinBuiltIns.isUnit(expressionType)) {
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.expression.has.unit.type"))
+            return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.expression.has.unit.type"))
         }
 
         val typeArgumentList = getQualifiedTypeArgumentList(KtPsiUtil.safeDeparenthesize(physicalExpression))
@@ -717,10 +718,10 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
         onNonInteractiveFinish: ((KtDeclaration) -> Unit)?
     ) {
         val expression = expressionToExtract?.let { KtPsiUtil.safeDeparenthesize(it) }
-            ?: return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression"))
+            ?: return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.expression"))
 
         if (expression.isAssignmentLHS()) {
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression"))
+            return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.expression"))
         }
 
         val physicalExpression = expression.substringContextOrThis
@@ -736,7 +737,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
         }
 
         val candidateContainers = expression.getCandidateContainers(resolutionFacade, bindingContext).ifEmpty {
-            return showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.container"))
+            return showErrorHint(project, editor, KotlinBundle.message("cannot.refactor.no.container"))
         }
 
         if (editor == null) {
@@ -748,7 +749,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
         }
 
         chooseContainerElementIfNecessary(candidateContainers, editor,
-                                          KotlinRefactoringBundle.message("text.select.target.code.block"), true, { it.first }) {
+                                          KotlinBundle.message("text.select.target.code.block"), true, { it.first }) {
             runWithChosenContainers(it.first, it.second)
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
index aa631d7fcb9..ce7d5fbac20 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
@@ -17,7 +17,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiReference
 import com.intellij.ui.NonFocusableCheckBox
 import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractKotlinInplaceIntroducer
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
@@ -62,7 +62,7 @@ class KotlinVariableInplaceIntroducer(
     init {
         initFormComponents {
             if (!doNotChangeVar) {
-                val varCheckBox = NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.declare.with.var"))
+                val varCheckBox = NonFocusableCheckBox(KotlinBundle.message("checkbox.text.declare.with.var"))
                 varCheckBox.isSelected = isVar
                 varCheckBox.addActionListener {
                     myProject.executeWriteCommand(commandName, commandName) {
@@ -79,7 +79,7 @@ class KotlinVariableInplaceIntroducer(
             if (expressionType != null && !noTypeInference) {
                 val renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(expressionType)
                 expressionTypeCheckBox =
-                    NonFocusableCheckBox(KotlinRefactoringBundle.message("checkbox.text.specify.type.explicitly")).apply {
+                    NonFocusableCheckBox(KotlinBundle.message("checkbox.text.specify.type.explicitly")).apply {
                         isSelected = false
                         addActionListener {
                             runWriteCommandAndRestart {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/introduceVariableUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/introduceVariableUtils.kt
index a4af9e8d342..870266ac434 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/introduceVariableUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/introduceVariableUtils.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -78,8 +78,8 @@ internal fun chooseApplicableComponentFunctions(
     if (editor == null) return callback(emptyList())
 
     val list = JBList<String>(
-        KotlinRefactoringBundle.message("text.create.single.variable"),
-        KotlinRefactoringBundle.message("text.create.destructuring.declaration")
+        KotlinBundle.message("text.create.single.variable"),
+        KotlinBundle.message("text.create.destructuring.declaration")
     )
     JBPopupFactory.getInstance()
         .createListPopupBuilder(list)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/AbstractParameterTablePanel.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/AbstractParameterTablePanel.kt
index 339bf6ea87d..5c802794509 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/AbstractParameterTablePanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/ui/AbstractParameterTablePanel.kt
@@ -11,7 +11,7 @@ import com.intellij.ui.ToolbarDecorator
 import com.intellij.ui.table.JBTable
 import com.intellij.util.ui.EditableModel
 import org.jetbrains.annotations.NonNls
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.psiUtil.isIdentifier
 import java.awt.BorderLayout
 import java.awt.Component
@@ -76,7 +76,7 @@ abstract class AbstractParameterTablePanel<Param, UIParam : AbstractParameterTab
             }
         }
 
-        table.columnModel.getColumn(PARAMETER_NAME_COLUMN).headerValue = KotlinRefactoringBundle.message("text.name")
+        table.columnModel.getColumn(PARAMETER_NAME_COLUMN).headerValue = KotlinBundle.message("text.name")
 
         createAdditionalColumns()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsModel.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsModel.kt
index 89036ffe709..7cf3280c44b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsModel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsModel.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.getPackage
 import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
 import org.jetbrains.kotlin.idea.core.util.toPsiFile
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.refactoring.getOrCreateKotlinFile
 import org.jetbrains.kotlin.idea.refactoring.move.getOrCreateDirectory
 import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*
@@ -70,7 +70,7 @@ internal class MoveKotlinTopLevelDeclarationsModel(
 
     private fun checkTargetFileName(fileName: String) {
         if (FileTypeManager.getInstance().getFileTypeByFileName(fileName) != KotlinFileType.INSTANCE) {
-            throw ConfigurationException(KotlinRefactoringBundle.message("refactoring.move.non.kotlin.file"))
+            throw ConfigurationException(KotlinBundle.message("refactoring.move.non.kotlin.file"))
         }
     }
 
@@ -192,7 +192,7 @@ internal class MoveKotlinTopLevelDeclarationsModel(
         } else {
             val targetFile = File(targetFilePath).toPsiFile(project)
             if (targetFile != null && targetFile !is KtFile) {
-                throw ConfigurationException(KotlinRefactoringBundle.message("refactoring.move.non.kotlin.file"))
+                throw ConfigurationException(KotlinBundle.message("refactoring.move.non.kotlin.file"))
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
index ab959cd7ab3..d37eb2c233c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.core.dropDefaultValue
-import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.references.AbstractKtReference
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.resolve.source.getPsi
@@ -55,7 +55,7 @@ class UnresolvableConventionViolationUsageInfo(
     element: PsiElement,
     referencedElement: PsiElement
 ) : UnresolvableCollisionUsageInfo(element, referencedElement) {
-    override fun getDescription(): String = KotlinRefactoringBundle.message("naming.convention.will.be.violated.after.rename")
+    override fun getDescription(): String = KotlinBundle.message("naming.convention.will.be.violated.after.rename")
 }
 
 class LostDefaultValuesInOverridingFunctionUsageInfo(
diff --git a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
index f604837beda..989e4d53598 100644
--- a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.kt
@@ -29,6 +29,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import com.intellij.util.Consumer
 import com.intellij.util.ThreeState
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinPluginUpdater
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.PluginUpdateStatus
@@ -245,7 +246,7 @@ class KotlinReportSubmitter : ITNReporterCompat() {
             ReportMessages.GROUP
                 .createNotification(
                     ReportMessages.ERROR_REPORT,
-                    KotlinReporterBundle.message("text.can.t.report.exception.from.patched.plugin"),
+                    KotlinBundle.message("reporter.text.can.t.report.exception.from.patched.plugin"),
                     NotificationType.INFORMATION,
                     null
                 )
@@ -264,13 +265,13 @@ class KotlinReportSubmitter : ITNReporterCompat() {
 
                 val rc = showDialog(
                     parentComponent,
-                    KotlinReporterBundle.message(
-                        "message.text.you.re.running.kotlin.plugin.version",
+                    KotlinBundle.message(
+                        "reporter.message.text.you.re.running.kotlin.plugin.version",
                         KotlinPluginUtil.getPluginVersion(),
                         status.pluginDescriptor.version
                     ),
-                    KotlinReporterBundle.message("title.update.kotlin.plugin"),
-                    arrayOf(KotlinReporterBundle.message("button.text.update"), KotlinReporterBundle.message("button.text.ignore")),
+                    KotlinBundle.message("reporter.title.update.kotlin.plugin"),
+                    arrayOf(KotlinBundle.message("reporter.button.text.update"), KotlinBundle.message("reporter.button.text.ignore")),
                     0, Messages.getInformationIcon()
                 )
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
deleted file mode 100644
index 62d312d8f2d..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReporterBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.reporter
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinReporterBundle"
-
-object KotlinReporterBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt
index fced0108f06..c8334045862 100644
--- a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinNonJvmSourceRootConverterProvider.kt
@@ -31,6 +31,7 @@ import org.jetbrains.jps.model.module.JpsTypedModuleSourceRoot
 import org.jetbrains.jps.model.serialization.facet.JpsFacetSerializer
 import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer.*
 import org.jetbrains.kotlin.config.getFacetPlatformByConfigurationElement
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.util.toVirtualFile
 import org.jetbrains.kotlin.idea.facet.KotlinFacetType
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
@@ -219,7 +220,7 @@ class KotlinNonJvmSourceRootConverterProvider : ConverterProvider("kotlin-non-jv
     }
 
     override fun getConversionDescription() =
-        KotlinRootsBundle.message("description.text.update.source.roots.for.non.jvm.modules.in.kotlin.project")
+        KotlinBundle.message("roots.description.text.update.source.roots.for.non.jvm.modules.in.kotlin.project")
 
     override fun createConverter(context: ConversionContext) = ConverterImpl(context)
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt b/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
deleted file mode 100644
index 76b797c3284..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/roots/KotlinRootsBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.roots
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinRootsBundle"
-
-object KotlinRootsBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt b/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
deleted file mode 100644
index 86075682059..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/script/KotlinScriptBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.script
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinScriptBundle"
-
-object KotlinScriptBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java
index 2c0f90fe591..926c1afb8b3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java
+++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager;
 import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings;
-import org.jetbrains.kotlin.idea.script.KotlinScriptBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition;
 
 import javax.swing.*;
@@ -94,7 +94,7 @@ public class KotlinScriptingSettingsConfigurable implements SearchableConfigurab
     @Override
     @Nls
     public String getDisplayName() {
-        return KotlinScriptBundle.message("name.kotlin.scripting");
+        return KotlinBundle.message("script.name.kotlin.scripting");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt
index 1b16eaca468..04f7ff323fa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt
@@ -17,11 +17,11 @@ import com.intellij.psi.PsiManager
 import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotifications
 import com.intellij.ui.HyperlinkLabel
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
 import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition
 import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
-import org.jetbrains.kotlin.idea.script.KotlinScriptBundle
 import org.jetbrains.kotlin.parsing.KotlinParserDefinition
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
@@ -70,8 +70,11 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot
 
         private fun createNotification(psiFile: KtFile, defs: List<ScriptDefinition>): EditorNotificationPanel =
             EditorNotificationPanel().apply {
-                setText(KotlinScriptBundle.message("text.multiple.script.definitions.are.applicable.for.this.script", defs.first().name))
-                createComponentActionLabel(KotlinScriptBundle.message("action.text.show.all")) { label ->
+                setText(
+                    KotlinBundle.message("script.text.multiple.script.definitions.are.applicable.for.this.script", defs.first().name))
+                createComponentActionLabel(
+                    KotlinBundle.message("script.action.text.show.all")
+                ) { label ->
                     val list = JBPopupFactory.getInstance().createListPopup(
                         object : BaseListPopupStep<ScriptDefinition>(null, defs) {
                             override fun getTextFor(value: ScriptDefinition): String =
@@ -85,12 +88,12 @@ class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNot
                     list.showUnderneathOf(label)
                 }
 
-                createComponentActionLabel(KotlinScriptBundle.message("action.text.ignore")) {
+                createComponentActionLabel(KotlinBundle.message("script.action.text.ignore")) {
                     KotlinScriptingSettings.getInstance(psiFile.project).suppressDefinitionsCheck = true
                     EditorNotifications.getInstance(psiFile.project).updateAllNotifications()
                 }
 
-                createComponentActionLabel(KotlinScriptBundle.message("action.text.open.settings")) {
+                createComponentActionLabel(KotlinBundle.message("script.action.text.open.settings")) {
                     ShowSettingsUtilImpl.showSettingsDialog(psiFile.project, KotlinScriptingSettingsConfigurable.ID, "")
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
index 594c6cfb4e2..de529d346c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
@@ -13,6 +13,7 @@ import com.intellij.openapi.roots.ModuleRootListener
 import com.intellij.openapi.roots.OrderEnumerator
 import com.intellij.openapi.vfs.JarFileSystem
 import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates
 import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT
@@ -43,7 +44,7 @@ class ScriptTemplatesFromDependenciesProvider(project: Project) : AsyncScriptDef
     }
 
     override val id = "ScriptTemplatesFromDependenciesProvider"
-    override val progressMessage = KotlinScriptBundle.message("progress.text.kotlin.scanning.dependencies.for.script.definitions")
+    override val progressMessage = KotlinBundle.message("script.progress.text.kotlin.scanning.dependencies.for.script.definitions")
 
     override fun loadScriptDefinitions(previous: List<ScriptDefinition>?): List<ScriptDefinition> {
         if (project.isDefault) return emptyList()
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt
index 77e237dfafe..0e3a743ceb6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.slicer.SliceUsage
 import com.intellij.usages.UsagePresentation
 import com.intellij.util.Processor
+import org.jetbrains.kotlin.idea.KotlinBundle
 
 class KotlinSliceDereferenceUsage(
     element: PsiElement,
@@ -20,6 +21,6 @@ class KotlinSliceDereferenceUsage(
     }
 
     override fun getPresentation() = object : UsagePresentation by super.getPresentation() {
-        override fun getTooltipText() = KotlinSlicerBundle.message("tool.tip.text.variable.dereferenced")
+        override fun getTooltipText() = KotlinBundle.message("slicer.tool.tip.text.variable.dereferenced")
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt.191 b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt.191
index 882dda6e62b..e9a19d8cf39 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt.191
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceDereferenceUsage.kt.191
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.slicer.SliceUsage
 import com.intellij.usages.UsagePresentation
 import com.intellij.util.Processor
+import org.jetbrains.kotlin.idea.KotlinBundle
 
 class KotlinSliceDereferenceUsage(
         element: PsiElement,
@@ -31,6 +32,6 @@ class KotlinSliceDereferenceUsage(
     }
 
     override fun getPresentation() = object : UsagePresentation by super.getPresentation() {
-        override fun getTooltipText() = KotlinSlicerBundle.message("tool.tip.text.variable.dereferenced")
+        override fun getTooltipText() = KotlinBundle.message("slicer.tool.tip.text.variable.dereferenced")
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt
index 51a33960529..bac29bb754e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt
@@ -10,17 +10,13 @@ import com.intellij.slicer.SliceUsageCellRendererBase
 import com.intellij.ui.JBColor
 import com.intellij.ui.SimpleTextAttributes
 import com.intellij.util.FontUtil
-import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
-import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
-import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.parents
-import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy
 import org.jetbrains.kotlin.resolve.descriptorUtil.isCompanionObject
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 
@@ -48,7 +44,7 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() {
         }
 
         append(
-            KotlinSlicerBundle.message("text.tracking.enclosing.lambda").repeat(sliceUsage.lambdaLevel),
+            KotlinBundle.message("slicer.text.tracking.enclosing.lambda").repeat(sliceUsage.lambdaLevel),
             SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES
         )
 
@@ -60,7 +56,7 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() {
                     it is KtConstructor<*>
         } as? KtDeclaration ?: return
 
-        append(KotlinSlicerBundle.message("text.in", ""), SimpleTextAttributes.GRAY_ATTRIBUTES)
+        append(KotlinBundle.message("slicer.text.in", ""), SimpleTextAttributes.GRAY_ATTRIBUTES)
 
         val descriptor = declaration.unsafeResolveToDescriptor()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
deleted file mode 100644
index 9de8ed60dd1..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSlicerBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.slicer
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinSlicerBundle"
-
-object KotlinSlicerBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt
index 21107a07c5a..219bb5527a0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt
@@ -24,6 +24,7 @@ import com.intellij.usages.UsageView
 import com.intellij.usages.UsageViewPresentation
 import com.intellij.usages.impl.UsageContextPanelBase
 import com.intellij.usages.impl.UsageViewImpl
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.KtDeclaration
 import java.awt.BorderLayout
 import javax.swing.JLabel
@@ -109,7 +110,7 @@ class KotlinUsageContextDataInflowPanel(
             return KotlinUsageContextDataInflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
         }
 
-        override fun getTabTitle() = KotlinSlicerBundle.message("title.dataflow.to.here")
+        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.to.here")
     }
 }
 
@@ -122,6 +123,6 @@ class KotlinUsageContextDataOutflowPanel(
             return KotlinUsageContextDataOutflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
         }
 
-        override fun getTabTitle() = KotlinSlicerBundle.message("title.dataflow.from.here")
+        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.from.here")
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.201 b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.201
index be1c51e5cc1..073926738e9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.201
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinUsageContextDataFlowPanelBase.kt.201
@@ -24,6 +24,7 @@ import com.intellij.usages.UsageView
 import com.intellij.usages.UsageViewPresentation
 import com.intellij.usages.impl.UsageContextPanelBase
 import com.intellij.usages.impl.UsageViewImpl
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.KtDeclaration
 import java.awt.BorderLayout
 import javax.swing.JLabel
@@ -109,7 +110,7 @@ class KotlinUsageContextDataInflowPanel(
             return KotlinUsageContextDataInflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
         }
 
-        override fun getTabTitle() = KotlinSlicerBundle.message("title.dataflow.to.here")
+        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.to.here")
     }
 }
 
@@ -122,6 +123,6 @@ class KotlinUsageContextDataOutflowPanel(
             return KotlinUsageContextDataOutflowPanel((usageView as UsageViewImpl).project, usageView.getPresentation())
         }
 
-        override fun getTabTitle() = KotlinSlicerBundle.message("title.dataflow.from.here")
+        override fun getTabTitle() = KotlinBundle.message("slicer.title.dataflow.from.here")
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
index 214206d5ae4..af1e902e55b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
@@ -24,6 +24,7 @@ import com.intellij.testIntegration.createTest.TestGenerators
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.findFacadeClass
 import org.jetbrains.kotlin.asJava.toLightClass
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.actions.JavaToKotlinAction
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.core.getPackage
@@ -108,8 +109,8 @@ class KotlinCreateTestIntention : SelfTargetingRangeIntention<KtNamedDeclaration
                 if (testFolders.isEmpty() && !propertiesComponent.getBoolean("create.test.in.the.same.root")) {
                     if (Messages.showOkCancelDialog(
                             project,
-                            KotlinTestIntegrationBundle.message("message.text.create.test.in.the.same.source.root"),
-                            KotlinTestIntegrationBundle.message("title.no.test.roots.found"),
+                            KotlinBundle.message("test.integration.message.text.create.test.in.the.same.source.root"),
+                            KotlinBundle.message("test.integration.title.no.test.roots.found"),
                             Messages.getQuestionIcon()
                         ) != Messages.OK
                     ) return
@@ -130,10 +131,10 @@ class KotlinCreateTestIntention : SelfTargetingRangeIntention<KtNamedDeclaration
                     // TODO: Override dialog method when it becomes protected
                     val answer = Messages.showYesNoDialog(
                         project,
-                        KotlinTestIntegrationBundle.message("message.text.kotlin.class", existingClass.name.toString()),
+                        KotlinBundle.message("test.integration.message.text.kotlin.class", existingClass.name.toString()),
                         CommonBundle.getErrorTitle(),
-                        KotlinTestIntegrationBundle.message("button.text.rewrite"),
-                        KotlinTestIntegrationBundle.message("button.text.cancel"),
+                        KotlinBundle.message("test.integration.button.text.rewrite"),
+                        KotlinBundle.message("test.integration.button.text.cancel"),
                         Messages.getErrorIcon()
                     )
                     if (answer == Messages.NO) return
diff --git a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
deleted file mode 100644
index 01408d47260..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestIntegrationBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.testIntegration
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinTestIntegrationBundle"
-
-object KotlinTestIntegrationBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as35 b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as35
index bca2f137a84..dc9c96c6175 100644
--- a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as35
+++ b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as35
@@ -9,6 +9,7 @@ import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.plugins.PluginNode
 import com.intellij.openapi.diagnostic.Logger
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.isDev
 import org.jetbrains.kotlin.idea.util.isEap
 import java.io.IOException
@@ -20,7 +21,7 @@ import javax.xml.bind.annotation.*
 
 class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
     override val verifierName: String
-        get() = KotlinUpdateBundle.message("name.android.studio")
+        get() = KotlinBundle.message("update.name.android.studio")
 
     // Verifies if a plugin can be installed in Android Studio 3.2+.
     // Currently used only by KotlinPluginUpdater.
@@ -42,21 +43,20 @@ class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
             val pluginCompatibility = unmarshaller.unmarshal(stream) as PluginCompatibility
 
             val release = getRelease(pluginCompatibility)
-                ?: return PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.no.verified.versions.for.this.build"))
+                ?: return PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.no.verified.versions.for.this.build"))
 
             return if (release.plugins().any { KOTLIN_PLUGIN_ID == it.id && version == it.version })
                 PluginVerifyResult.accept()
             else
-                PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.version.to.be.verified"))
+                PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.version.to.be.verified"))
         } catch (e: Exception) {
             LOG.info("Exception when verifying plugin ${pluginDescriptor.pluginId.idString} version $version", e)
             return when (e) {
                 is IOException ->
-                    PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.connect.to.compatibility.verification.repository"))
-                is JAXBException -> PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.parse.compatibility.verification.metadata"))
+                    PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.connect.to.compatibility.verification.repository"))
+                is JAXBException -> PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.parse.compatibility.verification.metadata"))
                 else -> PluginVerifyResult.decline(
-                    KotlinUpdateBundle.message(
-                        "reason.text.exception.during.verification",
+                    KotlinBundle.message("update.reason.text.exception.during.verification",
                         e.message.toString()
                     )
                 )
diff --git a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as36 b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as36
index bca2f137a84..dc9c96c6175 100644
--- a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as36
+++ b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as36
@@ -9,6 +9,7 @@ import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.plugins.PluginNode
 import com.intellij.openapi.diagnostic.Logger
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.isDev
 import org.jetbrains.kotlin.idea.util.isEap
 import java.io.IOException
@@ -20,7 +21,7 @@ import javax.xml.bind.annotation.*
 
 class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
     override val verifierName: String
-        get() = KotlinUpdateBundle.message("name.android.studio")
+        get() = KotlinBundle.message("update.name.android.studio")
 
     // Verifies if a plugin can be installed in Android Studio 3.2+.
     // Currently used only by KotlinPluginUpdater.
@@ -42,21 +43,20 @@ class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
             val pluginCompatibility = unmarshaller.unmarshal(stream) as PluginCompatibility
 
             val release = getRelease(pluginCompatibility)
-                ?: return PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.no.verified.versions.for.this.build"))
+                ?: return PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.no.verified.versions.for.this.build"))
 
             return if (release.plugins().any { KOTLIN_PLUGIN_ID == it.id && version == it.version })
                 PluginVerifyResult.accept()
             else
-                PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.version.to.be.verified"))
+                PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.version.to.be.verified"))
         } catch (e: Exception) {
             LOG.info("Exception when verifying plugin ${pluginDescriptor.pluginId.idString} version $version", e)
             return when (e) {
                 is IOException ->
-                    PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.connect.to.compatibility.verification.repository"))
-                is JAXBException -> PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.parse.compatibility.verification.metadata"))
+                    PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.connect.to.compatibility.verification.repository"))
+                is JAXBException -> PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.parse.compatibility.verification.metadata"))
                 else -> PluginVerifyResult.decline(
-                    KotlinUpdateBundle.message(
-                        "reason.text.exception.during.verification",
+                    KotlinBundle.message("update.reason.text.exception.during.verification",
                         e.message.toString()
                     )
                 )
diff --git a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as40 b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as40
index bca2f137a84..dc9c96c6175 100644
--- a/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as40
+++ b/idea/src/org/jetbrains/kotlin/idea/update/GooglePluginUpdateVerifier.kt.as40
@@ -9,6 +9,7 @@ import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.plugins.PluginNode
 import com.intellij.openapi.diagnostic.Logger
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.util.isDev
 import org.jetbrains.kotlin.idea.util.isEap
 import java.io.IOException
@@ -20,7 +21,7 @@ import javax.xml.bind.annotation.*
 
 class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
     override val verifierName: String
-        get() = KotlinUpdateBundle.message("name.android.studio")
+        get() = KotlinBundle.message("update.name.android.studio")
 
     // Verifies if a plugin can be installed in Android Studio 3.2+.
     // Currently used only by KotlinPluginUpdater.
@@ -42,21 +43,20 @@ class GooglePluginUpdateVerifier : PluginUpdateVerifier() {
             val pluginCompatibility = unmarshaller.unmarshal(stream) as PluginCompatibility
 
             val release = getRelease(pluginCompatibility)
-                ?: return PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.no.verified.versions.for.this.build"))
+                ?: return PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.no.verified.versions.for.this.build"))
 
             return if (release.plugins().any { KOTLIN_PLUGIN_ID == it.id && version == it.version })
                 PluginVerifyResult.accept()
             else
-                PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.version.to.be.verified"))
+                PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.version.to.be.verified"))
         } catch (e: Exception) {
             LOG.info("Exception when verifying plugin ${pluginDescriptor.pluginId.idString} version $version", e)
             return when (e) {
                 is IOException ->
-                    PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.connect.to.compatibility.verification.repository"))
-                is JAXBException -> PluginVerifyResult.decline(KotlinUpdateBundle.message("reason.text.unable.to.parse.compatibility.verification.metadata"))
+                    PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.connect.to.compatibility.verification.repository"))
+                is JAXBException -> PluginVerifyResult.decline(KotlinBundle.message("update.reason.text.unable.to.parse.compatibility.verification.metadata"))
                 else -> PluginVerifyResult.decline(
-                    KotlinUpdateBundle.message(
-                        "reason.text.exception.during.verification",
+                    KotlinBundle.message("update.reason.text.exception.during.verification",
                         e.message.toString()
                     )
                 )
diff --git a/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt b/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
deleted file mode 100644
index 06736a918ff..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/update/KotlinUpdateBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.update
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinUpdateBundle"
-
-object KotlinUpdateBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
index 17c8af6e2b6..c0c00811aed 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
@@ -39,6 +39,7 @@ import com.intellij.util.indexing.ScalarIndexExtension
 import com.intellij.util.text.VersionComparatorUtil
 import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
 import org.jetbrains.kotlin.idea.framework.isExternalLibrary
 import org.jetbrains.kotlin.idea.util.isSnapshot
@@ -183,8 +184,8 @@ private fun <T : BinaryVersion> getLibraryRootsWithAbiIncompatibleVersion(
 fun showRuntimeJarNotFoundDialog(project: Project, jarName: String) {
     Messages.showErrorDialog(
         project,
-        KotlinVersionBundle.message("dialog.message.is.not.found.make.sure.plugin.is.properly.installed", jarName),
-        KotlinVersionBundle.message("title.no.runtime.found")
+        KotlinBundle.message("version.dialog.message.is.not.found.make.sure.plugin.is.properly.installed", jarName),
+        KotlinBundle.message("version.title.no.runtime.found")
     )
 }
 
@@ -293,8 +294,8 @@ val DEPRECATED_LIBRARIES_INFORMATION = listOf(
         oldGroupId = "org.jetbrains.kotlin",
         oldName = PathUtil.KOTLIN_JAVA_RUNTIME_JRE7_NAME, newName = PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME,
         outdatedAfterVersion = "1.2.0-rc-39",
-        message = KotlinVersionBundle.message(
-            "message.is.deprecated.since.1.2.0.and.should.be.replaced.with",
+        message = KotlinBundle.message(
+            "version.message.is.deprecated.since.1.2.0.and.should.be.replaced.with",
             PathUtil.KOTLIN_JAVA_RUNTIME_JRE7_NAME,
             PathUtil.KOTLIN_JAVA_RUNTIME_JDK7_NAME
         )
@@ -304,8 +305,8 @@ val DEPRECATED_LIBRARIES_INFORMATION = listOf(
         oldGroupId = "org.jetbrains.kotlin",
         oldName = PathUtil.KOTLIN_JAVA_RUNTIME_JRE8_NAME, newName = PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME,
         outdatedAfterVersion = "1.2.0-rc-39",
-        message = KotlinVersionBundle.message(
-            "message.is.deprecated.since.1.2.0.and.should.be.replaced.with",
+        message = KotlinBundle.message(
+            "version.message.is.deprecated.since.1.2.0.and.should.be.replaced.with",
             PathUtil.KOTLIN_JAVA_RUNTIME_JRE8_NAME,
             PathUtil.KOTLIN_JAVA_RUNTIME_JDK8_NAME
         )
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt
deleted file mode 100644
index 088fa90984f..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinVersionBundle.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.versions
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinVersionBundle"
-
-object KotlinVersionBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}