diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
index e1573d09ae6..ee25c02e715 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt
@@ -316,7 +316,7 @@ public fun KtClassOrObject.effectiveDeclarations(): List<KtDeclaration> {
     }
 }
 
-public fun KtDeclaration.isExtensionDeclaration(): Boolean {
+public fun PsiElement.isExtensionDeclaration(): Boolean {
     val callable: KtCallableDeclaration? = when (this) {
         is KtNamedFunction, is KtProperty -> this as KtCallableDeclaration
         is KtPropertyAccessor -> getNonStrictParentOfType<KtProperty>()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index 1cfd754185b..95e89312491 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -38,6 +38,7 @@ import com.intellij.refactoring.util.MoveRenameUsageInfo
 import com.intellij.refactoring.util.NonCodeUsageInfo
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.IncorrectOperationException
+import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.descriptors.*
@@ -93,7 +94,7 @@ public fun KtElement.getInternalReferencesToUpdateOnPackageNameChange(packageNam
         val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(getProject(), descriptor) ?: return null
 
         val isCallable = descriptor is CallableDescriptor
-        val isExtension = isCallable && (descriptor as CallableDescriptor).getExtensionReceiverParameter() != null
+        val isExtension = isCallable && declaration.isExtensionDeclaration()
 
         if (isCallable && !isExtension) {
             val containingDescriptor = descriptor.getContainingDeclaration()