diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
index 591c57481614..ef814609d58c 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
@@ -88,6 +88,7 @@ public class NameSuggester {
   }
 
   public String suggestName(final String propertyName) {
+    if (myOldClassNameAsGiven.equals(propertyName)) return myNewClassNameAsGiven;
     final String[] propertyWords = NameUtil.splitNameIntoWords(propertyName);
     TIntIntHashMap matches = calculateMatches(propertyWords);
     if (matches.isEmpty()) return propertyName;