diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
index 03730eff4d2..4b466be340e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt
@@ -164,7 +164,7 @@ class CollectionStubMethodGenerator(
         val result = ArrayList<FunctionDescriptor>()
 
         OverrideResolver.generateOverridesInAClass(klass, listOf(), object : OverridingUtil.DescriptorSink {
-            override fun addToScope(fakeOverride: CallableMemberDescriptor) {
+            override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
                 if (fakeOverride !is FunctionDescriptor) return
                 if (fakeOverride.findOverriddenFromDirectSuperClass(mutableCollectionClass) != null) {
                     result.add(fakeOverride)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index 9d9c9ffa469..281951e026c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
@@ -99,7 +99,7 @@ public open class LazyClassMemberScope(
 
     private fun <D : CallableMemberDescriptor> generateFakeOverrides(name: Name, fromSupertypes: Collection<D>, result: MutableCollection<D>, exactDescriptorClass: Class<out D>) {
         OverridingUtil.generateOverridesInFunctionGroup(name, fromSupertypes, ArrayList(result), thisDescriptor, object : OverridingUtil.DescriptorSink {
-            override fun addToScope(fakeOverride: CallableMemberDescriptor) {
+            override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
                 assert(exactDescriptorClass.isInstance(fakeOverride)) { "Wrong descriptor type in an override: " + fakeOverride + " while expecting " + exactDescriptorClass.getSimpleName() }
                 @suppress("UNCHECKED_CAST")
                 result.add(fakeOverride as D)
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java
index 5339279af47..bc930f714a6 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java
@@ -54,7 +54,7 @@ public final class DescriptorResolverUtils {
                 new OverridingUtil.DescriptorSink() {
                     @Override
                     @SuppressWarnings("unchecked")
-                    public void addToScope(@NotNull CallableMemberDescriptor fakeOverride) {
+                    public void addFakeOverride(@NotNull CallableMemberDescriptor fakeOverride) {
                         OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, new Function1<CallableMemberDescriptor, Unit>() {
                             @Override
                             public Unit invoke(@NotNull CallableMemberDescriptor descriptor) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
index 13b68e0d240..1efe3d2b79e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
@@ -64,7 +64,7 @@ class FunctionClassScope(
                     /* membersFromCurrent = */ if (name == invoke?.getName()) listOf(invoke) else listOf(),
                     functionClass,
                     object : OverridingUtil.DescriptorSink {
-                        override fun addToScope(fakeOverride: CallableMemberDescriptor) {
+                        override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
                             OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, null)
                             result.add(fakeOverride as FunctionDescriptor)
                         }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
index 9ea7d184fd2..d8090db79f1 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
@@ -235,7 +235,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
                     new OverridingUtil.DescriptorSink() {
                         @Override
                         @SuppressWarnings("unchecked")
-                        public void addToScope(@NotNull CallableMemberDescriptor fakeOverride) {
+                        public void addFakeOverride(@NotNull CallableMemberDescriptor fakeOverride) {
                             OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, null);
                             result.add((D) fakeOverride);
                         }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
index 32dd748c5bd..ab6175cb5ad 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
@@ -356,7 +356,7 @@ public class OverridingUtil {
         for (CallableMemberDescriptor descriptor : effectiveOverridden) {
             bindOverride(fakeOverride, descriptor);
         }
-        sink.addToScope(fakeOverride);
+        sink.addFakeOverride(fakeOverride);
     }
 
     @NotNull
@@ -569,7 +569,7 @@ public class OverridingUtil {
     }
 
     public interface DescriptorSink {
-        void addToScope(@NotNull CallableMemberDescriptor fakeOverride);
+        void addFakeOverride(@NotNull CallableMemberDescriptor fakeOverride);
 
         void conflict(@NotNull CallableMemberDescriptor fromSuper, @NotNull CallableMemberDescriptor fromCurrent);
     }
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 1244c3f7e11..f9bb831697b 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -203,7 +203,7 @@ public class DeserializedClassDescriptor(
         private fun <D : CallableMemberDescriptor> generateFakeOverrides(name: Name, fromSupertypes: Collection<D>, result: MutableCollection<D>) {
             val fromCurrent = ArrayList<CallableMemberDescriptor>(result)
             OverridingUtil.generateOverridesInFunctionGroup(name, fromSupertypes, fromCurrent, classDescriptor, object : OverridingUtil.DescriptorSink {
-                override fun addToScope(fakeOverride: CallableMemberDescriptor) {
+                override fun addFakeOverride(fakeOverride: CallableMemberDescriptor) {
                     // TODO: report "cannot infer visibility"
                     OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, null)
                     @suppress("UNCHECKED_CAST")