diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameElementFix.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameElementFix.java
index ff2ca748c209..ee4343dd4030 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameElementFix.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameElementFix.java
@@ -18,8 +18,6 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
-import com.intellij.lang.LanguageNamesValidation;
-import com.intellij.lang.refactoring.NamesValidator;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -28,6 +26,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.refactoring.rename.RenameProcessor;
+import com.intellij.refactoring.rename.RenameUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -85,9 +84,7 @@ public class RenameElementFix extends LocalQuickFixAndIntentionActionOnPsiElemen
                              @NotNull PsiFile file,
                              @NotNull PsiElement startElement,
                              @NotNull PsiElement endElement) {
-    if (!startElement.isValid()) return false;
-    final NamesValidator namesValidator = LanguageNamesValidation.INSTANCE.forLanguage(file.getLanguage());
-    return namesValidator != null && namesValidator.isIdentifier(myNewName, project);
+    return startElement.isValid() && RenameUtil.isValidName(project, startElement, myNewName);
   }
 
   @Override