diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py
index 983d477..c492179 100644
--- a/Lib/packaging/pypi/simple.py
+++ b/Lib/packaging/pypi/simple.py
@@ -1,6 +1,6 @@
 """Spider using the screen-scraping "simple" PyPI API.
 
-This module contains the class SimpleIndexCrawler, a simple spider that
+This module contains the class Crawler, a simple spider that
 can be used to find and retrieve distributions from a project index
 (like the Python Package Index), using its so-called simple API (see
 reference implementation available at http://pypi.python.org/simple/).
@@ -178,7 +178,7 @@
 
     def get_releases(self, requirements, prefer_final=None,
                      force_update=False):
-        """Search for releases and return a ReleaseList object containing
+        """Search for releases and return a ReleasesList object containing
         the results.
         """
         predicate = get_version_predicate(requirements)
diff --git a/Lib/packaging/pypi/xmlrpc.py b/Lib/packaging/pypi/xmlrpc.py
index 7a9f6cc..befdf6d 100644
--- a/Lib/packaging/pypi/xmlrpc.py
+++ b/Lib/packaging/pypi/xmlrpc.py
@@ -31,11 +31,11 @@
     If no server_url is specified, use the default PyPI XML-RPC URL,
     defined in the DEFAULT_XMLRPC_INDEX_URL constant::
 
-        >>> client = XMLRPCClient()
+        >>> client = Client()
         >>> client.server_url == DEFAULT_XMLRPC_INDEX_URL
         True
 
-        >>> client = XMLRPCClient("http://someurl/")
+        >>> client = Client("http://someurl/")
         >>> client.server_url
         'http://someurl/'
     """
@@ -69,7 +69,7 @@
         informations (eg. make a new XML-RPC call).
         ::
 
-            >>> client = XMLRPCClient()
+            >>> client = Client()
             >>> client.get_releases('Foo')
             ['1.1', '1.2', '1.3']
 
@@ -189,7 +189,7 @@
 
         If no server proxy is defined yet, creates a new one::
 
-            >>> client = XmlRpcClient()
+            >>> client = Client()
             >>> client.proxy()
             <ServerProxy for python.org/pypi>