diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt
index 5d755f6c8fc..060d1d52f92 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt
@@ -34,7 +34,7 @@ public class SamConstructorDescriptor(
 )
 
 public object SamConstructorDescriptorKindExclude : DescriptorKindExclude {
-    override fun matches(descriptor: DeclarationDescriptor) = descriptor is SamConstructorDescriptor
+    override fun excludes(descriptor: DeclarationDescriptor) = descriptor is SamConstructorDescriptor
 
     override val fullyExcludedDescriptorKinds: Int get() = 0
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
index 6a180bc757b..85b66567d91 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
@@ -112,7 +112,7 @@ public class DescriptorKindFilter(
     }
 
     public fun accepts(descriptor: DeclarationDescriptor): Boolean
-            = kindMask and descriptor.kind() != 0 && excludes.all { !it.matches(descriptor) }
+            = kindMask and descriptor.kind() != 0 && excludes.all { !it.excludes(descriptor) }
 
     public fun acceptsKinds(kinds: Int): Boolean
             = kindMask and kinds != 0
@@ -202,21 +202,21 @@ public class DescriptorKindFilter(
 }
 
 public trait DescriptorKindExclude {
-    public fun matches(descriptor: DeclarationDescriptor): Boolean
+    public fun excludes(descriptor: DeclarationDescriptor): Boolean
 
     public val fullyExcludedDescriptorKinds: Int
 
     override fun toString() = this.javaClass.getSimpleName()
 
     public object Extensions : DescriptorKindExclude {
-        override fun matches(descriptor: DeclarationDescriptor)
+        override fun excludes(descriptor: DeclarationDescriptor)
                 = descriptor is CallableDescriptor && descriptor.getExtensionReceiverParameter() != null
 
         override val fullyExcludedDescriptorKinds: Int get() = 0
     }
 
     public object NonExtensions : DescriptorKindExclude {
-        override fun matches(descriptor: DeclarationDescriptor)
+        override fun excludes(descriptor: DeclarationDescriptor)
                 = descriptor !is CallableDescriptor || descriptor.getExtensionReceiverParameter() == null
 
         override val fullyExcludedDescriptorKinds: Int
@@ -224,7 +224,7 @@ public trait DescriptorKindExclude {
     }
 
     public object EnumEntry : DescriptorKindExclude {
-        override fun matches(descriptor: DeclarationDescriptor)
+        override fun excludes(descriptor: DeclarationDescriptor)
                 = descriptor is ClassDescriptor && descriptor.getKind() == ClassKind.ENUM_ENTRY
 
         override val fullyExcludedDescriptorKinds: Int get() = 0
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
index b2b77ba55a1..77faf1bfc0d 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
@@ -258,7 +258,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
 
     private companion object {
         object NonAnnotationClassifierExclude : DescriptorKindExclude {
-            override fun matches(descriptor: DeclarationDescriptor): Boolean {
+            override fun excludes(descriptor: DeclarationDescriptor): Boolean {
                 if (descriptor !is ClassifierDescriptor) return false
                 return descriptor !is ClassDescriptor || descriptor.getKind() != ClassKind.ANNOTATION_CLASS
             }