diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index cff9e5d3..e99ce0fc 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -128,7 +128,7 @@ class Evaluator(object):
         true (default).
 
         >>> pairs[2]                                        #doctest: +ELLIPSIS
-        (<Module: ...builtin...>, [<Name: ...>, ...])
+        (<Builtin: ...builtin...>, [<PyName: ...>, ...])
 
         :rtype: [(pr.Scope, [pr.Name])]
         :return: Return an generator that yields a pair of scope and names.
diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py
index c8be7770..e13fab91 100644
--- a/jedi/evaluate/compiled/__init__.py
+++ b/jedi/evaluate/compiled/__init__.py
@@ -129,8 +129,11 @@ class PyName(object):
     def get_parent_until(self):
         return self.parent.get_parent_until()
 
+    def __str__(self):
+        return self.name
+
     def __repr__(self):
-        return '<%s: (%s).%s>' % (type(self).__name__, repr(self._obj.obj), self.name)
+        return '<%s: (%s).%s>' % (type(self).__name__, self._obj.name, self.name)
 
     @property
     @underscore_memoization