diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
index 94b296140480..7acf9f07a0e9 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
@@ -252,6 +252,11 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     CommandProcessor.getInstance().executeCommand(myProject, runnable, commandName, null);
   }
 
+  @Override
+  protected String getNewName(String newName, ResolveSnapshotProvider.ResolveSnapshot snapshot) {
+    return newName;
+  }
+
   @Nullable
   public PsiElement getSubstituted() {
     if (mySubstituted != null && mySubstituted.isValid()) return mySubstituted;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 5701b3c6889b..dfc63772e0b0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -331,9 +331,7 @@ public class VariableInplaceRenamer {
                 finish();
 
                 TextResult value = templateState.getVariableValue(PRIMARY_VARIABLE_NAME);
-                if (value != null) {
-                  myNewName = value.toString();
-                }
+                myNewName = getNewName(value != null ? value.toString() : null, snapshot);
 
                 if (snapshot != null && performAutomaticRename()) {
                   if (LanguageNamesValidation.INSTANCE.forLanguage(scope1.getLanguage()).isIdentifier(myNewName, myProject)) {
@@ -462,6 +460,11 @@ public class VariableInplaceRenamer {
   protected void restoreStateBeforeDialogWouldBeShown() {
   }
 
+  @Nullable
+  protected String getNewName(String newName, ResolveSnapshotProvider.ResolveSnapshot snapshot) {
+    return snapshot != null ? newName : null;
+  }
+
   @Nullable
   protected StartMarkAction startRename() throws StartMarkAction.AlreadyStartedException {
     final StartMarkAction[] markAction = new StartMarkAction[1];