diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/KotlinIsReferenceToExtension.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt
similarity index 84%
rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/KotlinIsReferenceToExtension.kt
rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt
index ec2da34fc6b..7f6f16ed81c 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/KotlinIsReferenceToExtension.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/SimpleNameReferenceExtension.kt
@@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 import org.jetbrains.jet.lang.psi.JetPsiFactory
 
-public trait KotlinIsReferenceToExtension {
+public trait SimpleNameReferenceExtension {
     class object {
-        public val EP_NAME: ExtensionPointName<KotlinIsReferenceToExtension> = ExtensionPointName.create("org.jetbrains.kotlin.isReferenceToExtension")!!
+        public val EP_NAME: ExtensionPointName<SimpleNameReferenceExtension> = ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")!!
     }
 
     fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean?
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
index 61bf3e221ed..72b5e3313fb 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.psi.psiUtil.*
 import com.intellij.psi.impl.light.LightElement
 import com.intellij.openapi.extensions.Extensions
-import org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension
+import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension
 
 public class JetSimpleNameReference(
         jetSimpleNameExpression: JetSimpleNameExpression
@@ -46,7 +46,7 @@ public class JetSimpleNameReference(
     override fun isReferenceTo(element: PsiElement?): Boolean {
         if (element != null) {
             val extensions = Extensions.getArea(element.getProject()).getExtensionPoint(
-                    KotlinIsReferenceToExtension.EP_NAME).getExtensions()
+                    SimpleNameReferenceExtension.EP_NAME).getExtensions()
             for (extension in extensions) {
                 val value = extension.isReferenceTo(this, element)
                 if (value != null) {
@@ -87,7 +87,7 @@ public class JetSimpleNameReference(
             JetTokens.LABEL_IDENTIFIER -> psiFactory.createClassLabel(newElementName)
             else -> {
                 val extensions = Extensions.getArea(expression.getProject()).getExtensionPoint(
-                        KotlinIsReferenceToExtension.EP_NAME).getExtensions()
+                        SimpleNameReferenceExtension.EP_NAME).getExtensions()
 
                 var handled: PsiElement? = null
                 for (extension in extensions) {
diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml
index 8d95e053068..ee88ae4cfbb 100644
--- a/idea/src/META-INF/extensions/common.xml
+++ b/idea/src/META-INF/extensions/common.xml
@@ -17,8 +17,8 @@
         <extensionPoint name="findUsagesHandlerDecorator"
                         interface="org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindUsagesHandlerDecorator"
                         area="IDEA_PROJECT"/>
-        <extensionPoint name="isReferenceToExtension"
-                        interface="org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension"
+        <extensionPoint name="simpleNameReferenceExtension"
+                        interface="org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension"
                         area="IDEA_PROJECT"/>
     </extensionPoints>
 </idea-plugin>
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
index 429b2d4e2ca..6917f041a9f 100644
--- a/plugins/android-idea-plugin/src/META-INF/plugin.xml
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -25,6 +25,6 @@
       <externalDeclarationsProvider implementation="org.jetbrains.kotlin.android.AndroidDeclarationsProvider"/>
       <expressionCodegenExtension implementation="org.jetbrains.kotlin.android.AndroidExpressionCodegen"/>
       <findUsagesHandlerDecorator implementation="org.jetbrains.jet.plugin.android.AndroidFindUsageHandlerDecorator"/>
-      <isReferenceToExtension implementation="org.jetbrains.jet.plugin.android.AndroidKotlinIsReferenceToExtension"/>
+      <simpleNameReferenceExtension implementation="org.jetbrains.jet.plugin.android.AndroidSimpleNameReferenceExtension"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt
similarity index 92%
rename from plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt
index a0456b1ab8a..9bf079056e0 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidKotlinIsReferenceToExtension.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidSimpleNameReferenceExtension.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.android
 
-import org.jetbrains.jet.plugin.findUsages.handlers.KotlinIsReferenceToExtension
+import org.jetbrains.jet.plugin.findUsages.handlers.SimpleNameReferenceExtension
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.JetProperty
 import com.intellij.psi.impl.light.LightElement
 import org.jetbrains.jet.lang.psi.JetPsiFactory
 
-public class AndroidKotlinIsReferenceToExtension : KotlinIsReferenceToExtension {
+public class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
     override fun isReferenceTo(reference: JetSimpleNameReference, element: PsiElement): Boolean? {
         val resolvedElement = reference.resolve()
         if (resolvedElement == null) {