diff --git a/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementAdapter.java b/platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementAdapter.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementAdapter.java
rename to platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementAdapter.java
diff --git a/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListener.java b/platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementListener.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListener.java
rename to platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementListener.java
diff --git a/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerProvider.java b/platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerProvider.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerProvider.java
rename to platform/analysis-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerProvider.java
diff --git a/platform/lang-api/src/com/intellij/refactoring/listeners/UndoRefactoringElementListener.java b/platform/analysis-api/src/com/intellij/refactoring/listeners/UndoRefactoringElementListener.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/refactoring/listeners/UndoRefactoringElementListener.java
rename to platform/analysis-api/src/com/intellij/refactoring/listeners/UndoRefactoringElementListener.java
diff --git a/platform/analysis-impl/src/com/intellij/refactoring/rename/RenameUtilBase.java b/platform/analysis-impl/src/com/intellij/refactoring/rename/RenameUtilBase.java
new file mode 100644
index 000000000000..f79577349221
--- /dev/null
+++ b/platform/analysis-impl/src/com/intellij/refactoring/rename/RenameUtilBase.java
@@ -0,0 +1,88 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.refactoring.rename;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNamedElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.meta.PsiMetaData;
+import com.intellij.psi.meta.PsiMetaOwner;
+import com.intellij.psi.meta.PsiWritableMetaData;
+import com.intellij.refactoring.listeners.RefactoringElementListener;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class RenameUtilBase {
+
+  private static final Logger LOG = Logger.getInstance(RenameUtilBase.class);
+
+  private RenameUtilBase() {
+  }
+
+
+  static void doRenameGenericNamedElement(@NotNull PsiElement namedElement,
+                                          String newName,
+                                          UsageInfo[] usages,
+                                          @Nullable RefactoringElementListener listener) {
+    PsiWritableMetaData writableMetaData = null;
+    if (namedElement instanceof PsiMetaOwner) {
+      final PsiMetaData metaData = ((PsiMetaOwner)namedElement).getMetaData();
+      if (metaData instanceof PsiWritableMetaData) {
+        writableMetaData = (PsiWritableMetaData)metaData;
+      }
+    }
+    if (writableMetaData == null && !(namedElement instanceof PsiNamedElement)) {
+      LOG.error("Unknown element type:" + namedElement);
+    }
+
+    boolean hasBindables = false;
+    for (UsageInfo usage : usages) {
+      if (!(usage.getReference() instanceof BindablePsiReference)) {
+        rename(usage, newName);
+      } else {
+        hasBindables = true;
+      }
+    }
+
+    if (writableMetaData != null) {
+      writableMetaData.setName(newName);
+    }
+    else {
+      PsiElement namedElementAfterRename = ((PsiNamedElement)namedElement).setName(newName);
+      if (namedElementAfterRename != null) namedElement = namedElementAfterRename;
+    }
+
+    if (hasBindables) {
+      for (UsageInfo usage : usages) {
+        final PsiReference ref = usage.getReference();
+        if (ref instanceof BindablePsiReference) {
+          boolean fallback = true;
+          if (!(ref instanceof FragmentaryPsiReference
+                && ((FragmentaryPsiReference)ref).isFragmentOnlyRename())) {
+            try {
+              ref.bindToElement(namedElement);
+              fallback = false;
+            }
+            catch (IncorrectOperationException ignored) {
+            }
+          }
+          if (fallback) {//fall back to old scheme
+            ref.handleElementRename(newName);
+          }
+        }
+      }
+    }
+    if (listener != null) {
+      listener.elementRenamed(namedElement);
+    }
+  }
+
+  static void rename(UsageInfo info, String newName) {
+    if (info.getElement() == null) return;
+    PsiReference ref = info.getReference();
+    if (ref == null) return;
+    ref.handleElementRename(newName);
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
index fa8daecf5aee..26a8399c7b0a 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
@@ -21,7 +21,6 @@ import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.psi.*;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.meta.PsiMetaOwner;
-import com.intellij.psi.meta.PsiWritableMetaData;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.PsiSearchHelper;
@@ -213,64 +212,11 @@ public class RenameUtil {
 
   public static void doRenameGenericNamedElement(@NotNull PsiElement namedElement, String newName, UsageInfo[] usages,
                                                  @Nullable RefactoringElementListener listener) throws IncorrectOperationException {
-    PsiWritableMetaData writableMetaData = null;
-    if (namedElement instanceof PsiMetaOwner) {
-      final PsiMetaData metaData = ((PsiMetaOwner)namedElement).getMetaData();
-      if (metaData instanceof PsiWritableMetaData) {
-        writableMetaData = (PsiWritableMetaData)metaData;
-      }
-    }
-    if (writableMetaData == null && !(namedElement instanceof PsiNamedElement)) {
-      LOG.error("Unknown element type:" + namedElement);
-    }
-
-    boolean hasBindables = false;
-    for (UsageInfo usage : usages) {
-      if (!(usage.getReference() instanceof BindablePsiReference)) {
-        rename(usage, newName);
-      } else {
-        hasBindables = true;
-      }
-    }
-
-    if (writableMetaData != null) {
-      writableMetaData.setName(newName);
-    }
-    else {
-      PsiElement namedElementAfterRename = ((PsiNamedElement)namedElement).setName(newName);
-      if (namedElementAfterRename != null) namedElement = namedElementAfterRename;
-    }
-
-    if (hasBindables) {
-      for (UsageInfo usage : usages) {
-        final PsiReference ref = usage.getReference();
-        if (ref instanceof BindablePsiReference) {
-          boolean fallback = true;
-          if (!(ref instanceof FragmentaryPsiReference
-                && ((FragmentaryPsiReference)ref).isFragmentOnlyRename())) {
-            try {
-              ref.bindToElement(namedElement);
-              fallback = false;
-            }
-            catch (IncorrectOperationException ignored) {
-            }
-          }
-          if (fallback) {//fall back to old scheme
-            ref.handleElementRename(newName);
-          }
-        }
-      }
-    }
-    if (listener != null) {
-      listener.elementRenamed(namedElement);
-    }
+    RenameUtilBase.doRenameGenericNamedElement(namedElement, newName, usages, listener);
   }
 
   public static void rename(UsageInfo info, String newName) throws IncorrectOperationException {
-    if (info.getElement() == null) return;
-    PsiReference ref = info.getReference();
-    if (ref == null) return;
-    ref.handleElementRename(newName);
+    RenameUtilBase.rename(info, newName);
   }
 
   @Nullable