diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index bba546465f52..e63714fcbdb0 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -52,7 +52,7 @@
     <referenceImporter implementation="com.jetbrains.python.validation.PythonReferenceImporter"/>
     <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.python.codeInsight.PyLineMarkerProvider"/>
     <definitionsSearch implementation="com.jetbrains.python.psi.search.PyDefinitionsSearch"/>
-    <gotoImplementationRendererProvider implementation="com.jetbrains.python.codeInsight.PyGotoImplementationRendererProvider"/>
+    <gotoTargetRendererProvider implementation="com.jetbrains.python.codeInsight.PyGotoTargetRendererProvider"/>
 
     <intentionAction factoryClass="com.jetbrains.python.PyExtensionFactory"
                      factoryArgument="intentions/PyDemorganIntention.py">
diff --git a/python/src/com/jetbrains/python/codeInsight/PyGotoImplementationRendererProvider.java b/python/src/com/jetbrains/python/codeInsight/PyGotoTargetRendererProvider.java
similarity index 55%
rename from python/src/com/jetbrains/python/codeInsight/PyGotoImplementationRendererProvider.java
rename to python/src/com/jetbrains/python/codeInsight/PyGotoTargetRendererProvider.java
index 77a35b30ae95..e6aeba0ac427 100644
--- a/python/src/com/jetbrains/python/codeInsight/PyGotoImplementationRendererProvider.java
+++ b/python/src/com/jetbrains/python/codeInsight/PyGotoTargetRendererProvider.java
@@ -1,7 +1,6 @@
 package com.jetbrains.python.codeInsight;
 
-import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.navigation.GotoImplementationRendererProvider;
+import com.intellij.codeInsight.navigation.GotoTargetRendererProvider;
 import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
@@ -10,7 +9,7 @@ import com.jetbrains.python.psi.PyElement;
 /**
  * @author yole
  */
-public class PyGotoImplementationRendererProvider implements GotoImplementationRendererProvider {
+public class PyGotoTargetRendererProvider implements GotoTargetRendererProvider {
   public PsiElementListCellRenderer getRenderer(final PsiElement[] elements) {
     for(PsiElement element: elements) {
       if (!(element instanceof PyElement) || !(element instanceof PsiNamedElement)) return null;
@@ -18,7 +17,4 @@ public class PyGotoImplementationRendererProvider implements GotoImplementationR
     return new PyElementListCellRenderer();
   }
 
-  public String getChooserTitle(final String name, final PsiElement[] elements) {
-    return CodeInsightBundle.message("goto.implementation.chooser.title", name, elements.length);
-  }
 }