diff --git a/doc/source/overview_auth.rst b/doc/source/overview_auth.rst
index 229a9faa20..2bb00d73c8 100644
--- a/doc/source/overview_auth.rst
+++ b/doc/source/overview_auth.rst
@@ -113,11 +113,11 @@ Swift is able to authenticate against OpenStack keystone via the
 :mod:`swift.common.middleware.keystoneauth` middleware.
 
 In order to use the ``keystoneauth`` middleware the ``authtoken``
-middleware from python-keystoneclient will need to be configured.
+middleware from keystonemiddleware will need to be configured.
 
 The ``authtoken`` middleware performs the authentication token
 validation and retrieves actual user authentication information. It
-can be found in the python-keystoneclient distribution.
+can be found in the keystonemiddleware distribution.
 
 The ``keystoneauth`` middleware performs authorization and mapping the
 ``keystone`` roles to Swift's ACLs.
@@ -149,7 +149,7 @@ and add auth_token and keystoneauth in your
 add the configuration for the authtoken middleware::
 
   [filter:authtoken]
-  paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+  paste.filter_factory = keystonemiddleware.auth_token:filter_factory
   auth_host = keystonehost
   auth_port = 35357
   auth_protocol = http
diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index ec8eb8ef9e..77aac3627f 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -266,7 +266,7 @@ user_test_tester3 = testing3
 # there you can change it to: authtoken keystoneauth
 #
 # [filter:authtoken]
-# paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+# paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 # auth_host = keystonehost
 # auth_port = 35357
 # auth_protocol = http