diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java
index 81d48c9e434..b2ca362a2ba 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java
@@ -104,7 +104,8 @@ abstract class KtNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extends
             }
         }
 
-        PsiElement newIdentifier = KtPsiFactory(this).createNameIdentifierIfPossible(name);
+        PsiElement newIdentifier =
+                KtPsiFactory(this).createNameIdentifierIfPossible(KtPsiUtilKt.quoteIfNeeded(name));
         if (newIdentifier != null) {
             KtPsiUtilKt.astReplace(identifier, newIdentifier);
         }
diff --git a/idea/testData/refactoring/rename/inplace/AddQuotes.kt b/idea/testData/refactoring/rename/inplace/AddQuotes.kt
new file mode 100644
index 00000000000..5553423ee6a
--- /dev/null
+++ b/idea/testData/refactoring/rename/inplace/AddQuotes.kt
@@ -0,0 +1,5 @@
+fun <caret>foo() {}
+
+fun main(args: Array<String>) {
+    foo()
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/inplace/AddQuotes.kt.after b/idea/testData/refactoring/rename/inplace/AddQuotes.kt.after
new file mode 100644
index 00000000000..c2b3a9ef65d
--- /dev/null
+++ b/idea/testData/refactoring/rename/inplace/AddQuotes.kt.after
@@ -0,0 +1,5 @@
+fun `is`() {}
+
+fun main(args: Array<String>) {
+    `is`()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
index 4a4c4f06820..dbfede78f5d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt
@@ -110,6 +110,10 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() {
         doTestMemberInplaceRename("plus")
     }
 
+    fun testAddQuotes() {
+        doTestMemberInplaceRename("is")
+    }
+
     private fun doTestImplicitLambdaParameter(newName: String) {
         configureByFile(getTestName(false) + ".kt")