diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst
index e02aad45..ce760ef3 100644
--- a/doc/source/middlewarearchitecture.rst
+++ b/doc/source/middlewarearchitecture.rst
@@ -196,7 +196,7 @@ a WSGI component. Example for the auth_token middleware:
     # value)
     #signing_dir=<None>
 
-    # If defined, the memcache server(s) to use for caching (list
+    # If defined, the memcached server(s) to use for caching (list
     # value)
     # Deprecated group/name - [DEFAULT]/memcache_servers
     #memcached_servers=<None>
@@ -315,7 +315,7 @@ Configuration Options
 * ``signing_dir``: (optional) Directory used to cache files related to PKI
   tokens
 
-* ``memcached_servers``: (optional) If defined, the memcache server(s) to use
+* ``memcached_servers``: (optional) If defined, the memcached server(s) to use
   for caching
 * ``token_cache_time``: (default 300) In order to prevent excessive requests
   and validations, the middleware uses an in-memory cache for the tokens the
@@ -350,7 +350,7 @@ invalidated tokens may continue to work if they are still in the token cache,
 so token_cache_time is configurable. For larger deployments, the middleware
 also supports memcache based caching.
 
-* ``memcached_servers``: (optonal) if defined, the memcache server(s) to use for
+* ``memcached_servers``: (optonal) if defined, the memcached server(s) to use for
   cacheing. It will be ignored if Swift MemcacheRing is used instead.
 * ``token_cache_time``: (optional, default 300 seconds) Set to -1 to disable
   caching completely.
@@ -391,7 +391,7 @@ Memcache Protection
 
 When using memcached, we are storing user tokens and token validation
 information into the cache as raw data. Which means that anyone who
-has access to the memcache servers can read and modify data stored
+has access to the memcached servers can read and modify data stored
 there. To mitigate this risk, ``auth_token`` middleware provides an
 option to authenticate and optionally encrypt the token data stored in
 the cache.
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index 80539714..ffd29493 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -325,7 +325,7 @@ _OPTS = [
     cfg.IntOpt('memcache_pool_socket_timeout',
                default=3,
                help='(Optional) Socket timeout in seconds for communicating '
-                    'with a memcache server.'),
+                    'with a memcached server.'),
     cfg.IntOpt('memcache_pool_unused_timeout',
                default=60,
                help='(Optional) Number of seconds a connection to memcached'
@@ -333,10 +333,10 @@ _OPTS = [
     cfg.IntOpt('memcache_pool_conn_get_timeout',
                default=10,
                help='(Optional) Number of seconds that an operation will wait '
-                    'to get a memcache client connection from the pool.'),
+                    'to get a memcached client connection from the pool.'),
     cfg.BoolOpt('memcache_use_advanced_pool',
                 default=False,
-                help='(Optional) Use the advanced (eventlet safe) memcache '
+                help='(Optional) Use the advanced (eventlet safe) memcached '
                      'client pool. The advanced pool will only work under '
                      'python 2.x.'),
     cfg.BoolOpt('include_service_catalog',
diff --git a/keystonemiddleware/auth_token/_cache.py b/keystonemiddleware/auth_token/_cache.py
index ae155776..d40f5842 100644
--- a/keystonemiddleware/auth_token/_cache.py
+++ b/keystonemiddleware/auth_token/_cache.py
@@ -57,7 +57,7 @@ class _MemcacheClientPool(object):
                  memcache_pool_conn_get_timeout=None,
                  memcache_pool_socket_timeout=None):
         # NOTE(morganfainberg): import here to avoid hard dependency on
-        # python-memcache library.
+        # python-memcached library.
         global _memcache_pool
         from keystonemiddleware.auth_token import _memcache_pool