diff --git a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 59a3afa70b15..2e8e7196a80c 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -270,6 +270,16 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
       public String getPresentableText() {
         return notNullize(getName(), PyNames.UNNAMED_ELEMENT) + getParameterList().getPresentableText(true);
       }
+
+      @Nullable
+      @Override
+      public String getLocationString() {
+        final PyClass containingClass = getContainingClass();
+        if (containingClass != null) {
+          return "(" + containingClass.getName() + " in " + getPackageForFile(getContainingFile()) + ")";
+        }
+        return super.getLocationString();
+      }
     };
   }
 
diff --git a/python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml b/python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml
index 1b720a99aee9..100a9c5448a1 100644
--- a/python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml
+++ b/python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml
@@ -1,8 +1,8 @@
-<node text="A.__init__(self) (hierarchy.call.Static.Constructor.main)" base="true">
+<node text="A.__init__(self) (A in hierarchy.call.Static.Constructor.main)" base="true">
   <node text="invoke1(p) (hierarchy.call.Static.Constructor.main)">
-    <node text="A.method1(self) (hierarchy.call.Static.Constructor.main)"/>
+    <node text="A.method1(self) (A in hierarchy.call.Static.Constructor.main)"/>
   </node>
   <node text="invoke2(p) (hierarchy.call.Static.Constructor.main)">
-    <node text="A.method2(self) (hierarchy.call.Static.Constructor.main)"/>
+    <node text="A.method2(self) (A in hierarchy.call.Static.Constructor.main)"/>
   </node>
 </node>
\ No newline at end of file
diff --git a/python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml b/python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml
index b872e20e6c7b..8b70d0c1c04b 100644
--- a/python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml
+++ b/python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml
@@ -1,6 +1,6 @@
-<node text="A.__init__(self) (hierarchy.call.Static.Constructor.main)" base="true">
+<node text="A.__init__(self) (A in hierarchy.call.Static.Constructor.main)" base="true">
   <node text="invokeA() (hierarchy.call.Static.Constructor.main)">
-    <node text="C.bar(self) (hierarchy.call.Static.Constructor.main)"/>
+    <node text="C.bar(self) (C in hierarchy.call.Static.Constructor.main)"/>
   </node>
-  <node text="C.bar(self) (hierarchy.call.Static.Constructor.main)"/>
+  <node text="C.bar(self) (C in hierarchy.call.Static.Constructor.main)"/>
 </node>
\ No newline at end of file
diff --git a/python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml b/python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml
index cf65c63a4d04..8f7c5104f231 100644
--- a/python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml
+++ b/python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml
@@ -1 +1 @@
-<node text="A.target_func(self) (hierarchy.call.Static.Inheritance.main)" base="true"/>
\ No newline at end of file
+<node text="A.target_func(self) (A in hierarchy.call.Static.Inheritance.main)" base="true"/>
\ No newline at end of file
diff --git a/python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml b/python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml
index a81d537dcc27..a01c0e8c3a71 100644
--- a/python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml
+++ b/python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml
@@ -1,4 +1,4 @@
-<node text="A.target_func(self) (hierarchy.call.Static.Inheritance.main)" base="true">
-  <node text="C.func(self, a) (hierarchy.call.Static.Inheritance.main)"/>
+<node text="A.target_func(self) (A in hierarchy.call.Static.Inheritance.main)" base="true">
+  <node text="C.func(self, a) (C in hierarchy.call.Static.Inheritance.main)"/>
   <node text="foo2(b) (hierarchy.call.Static.Inheritance.main)"/>
 </node>
\ No newline at end of file
diff --git a/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml b/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml
index 04af9fdd87ed..66557bd8da18 100644
--- a/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml
+++ b/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml
@@ -1,3 +1,3 @@
-<node text="B.target_func(self, p) (hierarchy.call.Static.OverriddenMethod.main)" base="true">
-  <node text="A.another_func(self) (hierarchy.call.Static.OverriddenMethod.file_1)"/>
+<node text="B.target_func(self, p) (B in hierarchy.call.Static.OverriddenMethod.main)" base="true">
+  <node text="A.another_func(self) (A in hierarchy.call.Static.OverriddenMethod.file_1)"/>
 </node>
\ No newline at end of file
diff --git a/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml b/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml
index ddf9369f2766..23bbf44306b1 100644
--- a/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml
+++ b/python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml
@@ -1,5 +1,5 @@
-<node text="B.target_func(self, p) (hierarchy.call.Static.OverriddenMethod.main)" base="true">
-  <node text="C.func1(self, a) (hierarchy.call.Static.OverriddenMethod.main)"/>
+<node text="B.target_func(self, p) (B in hierarchy.call.Static.OverriddenMethod.main)" base="true">
+  <node text="C.func1(self, a) (C in hierarchy.call.Static.OverriddenMethod.main)"/>
   <node text="bar1(a) (hierarchy.call.Static.OverriddenMethod.main)"/>
-  <node text="C.func2(self) (hierarchy.call.Static.OverriddenMethod.main)"/>
+  <node text="C.func2(self) (C in hierarchy.call.Static.OverriddenMethod.main)"/>
 </node>
\ No newline at end of file