diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
index 46779311ff4..5686ec10a9b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
@@ -188,7 +188,7 @@ abstract class KotlinGenerateTestSupportActionBase(
             }
             errorHint?.let { HintManager.getInstance().showErrorHint(editor, it) }
         } catch (e: IncorrectOperationException) {
-            val message = KotlinBundle.message("action.generate.test.support.error.cant.generate.method", e.message)
+            val message = KotlinBundle.message("action.generate.test.support.error.cant.generate.method", e.message.toString())
             HintManager.getInstance().showErrorHint(editor, message)
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/utils.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/utils.kt
index d4009dcf67e..f1ceb0767d0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/utils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/utils.kt
@@ -61,7 +61,7 @@ fun confirmMemberRewrite(targetClass: KtClass, vararg descriptors: FunctionDescr
     if (ApplicationManager.getApplication().isUnitTestMode) return true
 
     val functionsText = descriptors.joinToString(separator = " and ") { "'${MEMBER_RENDERER.render(it)}'" }
-    val message = KotlinBundle.message("action.generate.functions.already.defined", functionsText, targetClass.name)
+    val message = KotlinBundle.message("action.generate.functions.already.defined", functionsText, targetClass.name.toString())
     return Messages.showYesNoDialog(
         targetClass.project, message,
         CodeInsightBundle.message("generate.equals.and.hashcode.already.defined.title"),
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 8d24b8c15bb..55a946c5fde 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
@@ -113,8 +113,8 @@ fun buildNavigateToPropertyOverriddenDeclarationsPopup(e: MouseEvent?, element:
 
     return NavigationPopupDescriptor(
         navigatingOverrides,
-        KotlinBundle.message("overridden.marker.implementations.choose.implementation.title", propertyOrParameter.name),
-        KotlinBundle.message("overridden.marker.implementations.choose.implementation.find.usages", propertyOrParameter.name), renderer
+        KotlinBundle.message("overridden.marker.implementations.choose.implementation.title", propertyOrParameter.name.toString()),
+        KotlinBundle.message("overridden.marker.implementations.choose.implementation.find.usages", propertyOrParameter.name.toString()), renderer
     )
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
index 219f59f1794..ecf43e84e7d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/DeclarationPresenters.kt
@@ -32,7 +32,7 @@ open class KotlinDefaultNamedDeclarationPresentation(private val declaration: Kt
         if ((declaration is KtFunction && declaration.isLocal) || (declaration is KtClassOrObject && declaration.isLocal)) {
             val containingDeclaration = declaration.getStrictParentOfType<KtNamedDeclaration>() ?: return null
             val containerName = containingDeclaration.fqName ?: containingDeclaration.name
-            return KotlinBundle.message("presentation.text.in.container.paren", containerName)
+            return KotlinBundle.message("presentation.text.in.container.paren", containerName.toString())
         }
 
         val name = declaration.fqName
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
index b481eb6eff4..5d7b8c8e32a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
@@ -117,7 +117,7 @@ class AddFunctionToSupertypeFix private constructor(
     private fun actionName(functionData: FunctionData): String {
         return KotlinBundle.message(
             "fix.add.function.supertype.add.to",
-            functionData.signaturePreview, functionData.targetClass.name
+            functionData.signaturePreview, functionData.targetClass.name.toString()
         )
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
index 8ed79d86a54..b525b5f5e5a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
@@ -34,7 +34,7 @@ class AddGenericUpperBoundFix(
     override fun getText(): String {
         val element = this.element
         return when {
-            element != null -> KotlinBundle.message("fix.add.generic.upperbound.text", renderedUpperBound, element.name)
+            element != null -> KotlinBundle.message("fix.add.generic.upperbound.text", renderedUpperBound, element.name.toString())
             else -> null
         } ?: ""
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineModifierFix.kt
index 69aefe56627..018a0ad9233 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineModifierFix.kt
@@ -25,7 +25,7 @@ class AddInlineModifierFix(
     override fun getText(): String {
         val element = this.element
         return when {
-            element != null -> KotlinBundle.message("fix.add.modifier.inline.parameter.text", modifier.value, element.name)
+            element != null -> KotlinBundle.message("fix.add.modifier.inline.parameter.text", modifier.value, element.name.toString())
             else -> null
         } ?: ""
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionFix.kt
index c57d933c776..952d204a66c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInlineToFunctionFix.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 class AddInlineToFunctionFix(function: KtFunction) :
     KotlinQuickFixAction<KtFunction>(function) {
     override fun getFamilyName(): String = KotlinBundle.message("fix.add.modifier.inline.function.family")
-    override fun getText(): String = KotlinBundle.message("fix.add.modifier.inline.function.text", element?.name)
+    override fun getText(): String = KotlinBundle.message("fix.add.modifier.inline.function.text", element?.name.toString())
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         element?.addModifier(KtTokens.INLINE_KEYWORD)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddPropertyToSupertypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddPropertyToSupertypeFix.kt
index b3093d192a9..45aa2d1e5e6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddPropertyToSupertypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddPropertyToSupertypeFix.kt
@@ -92,7 +92,7 @@ class AddPropertyToSupertypeFix private constructor(
     }
 
     private fun actionName(propertyData: PropertyData): String {
-        return KotlinBundle.message("fix.add.property.to.supertype.text", propertyData.signaturePreview, propertyData.targetClass.name)
+        return KotlinBundle.message("fix.add.property.to.supertype.text", propertyData.signaturePreview, propertyData.targetClass.name.toString())
     }
 
     companion object : KotlinSingleIntentionActionFactory() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
index 55bd1273259..154ef3a0488 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeAnnotationToValueParameterFix.kt
@@ -57,7 +57,7 @@ class AddTypeAnnotationToValueParameterFix(element: KtParameter) : KotlinQuickFi
     override fun getFamilyName() = KotlinBundle.message("fix.add.type.annnotation.family")
 
     override fun getText() =
-        element?.let { KotlinBundle.message("fix.add.type.annnotation.text", typeNameShort, it.name) } ?: ""
+        element?.let { KotlinBundle.message("fix.add.type.annnotation.text", typeNameShort.toString(), it.name.toString()) } ?: ""
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val element = element ?: return
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
index 6e12e7ae068..6e37fe7cb74 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.kt
@@ -48,13 +48,13 @@ class ChangeParameterTypeFix(element: KtParameter, type: KotlinType) : KotlinQui
             isPrimaryConstructorParameter -> {
                 KotlinBundle.message(
                     "fix.change.return.type.text.primary.constructor",
-                    element.name, containingDeclarationName, typePresentation
+                    element.name.toString(), containingDeclarationName.toString(), typePresentation
                 )
             }
             else -> {
                 KotlinBundle.message(
                     "fix.change.return.type.text.function",
-                    element.name, containingDeclarationName, typePresentation
+                    element.name.toString(), containingDeclarationName.toString(), typePresentation
                 )
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToUseSpreadOperatorFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToUseSpreadOperatorFix.kt
index 3b101f0e535..2e3f32cc1ec 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToUseSpreadOperatorFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToUseSpreadOperatorFix.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 class ChangeToUseSpreadOperatorFix(element: KtExpression) : KotlinQuickFixAction<KtExpression>(element) {
     override fun getFamilyName() = KotlinBundle.message("fix.change.to.use.spread.operator.family")
 
-    override fun getText() = KotlinBundle.message("fix.change.to.use.spread.operator.text", element?.text, "*${element?.text}")
+    override fun getText() = KotlinBundle.message("fix.change.to.use.spread.operator.text", element?.text.toString(), "*${element?.text}")
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
         val element = element ?: return