diff --git a/deployment/puppet/keystone/manifests/init.pp b/deployment/puppet/keystone/manifests/init.pp
index 4eed54ddaf..94ae3d562e 100644
--- a/deployment/puppet/keystone/manifests/init.pp
+++ b/deployment/puppet/keystone/manifests/init.pp
@@ -37,7 +37,7 @@
 #   [cache_dir] Directory created when token_provider is pki. Optional.
 #     Defaults to /var/cache/keystone.
 #   [memcache_servers] List of memcache servers/ports. Optional. Used with
-#     token_driver keystone.token.backends.memcache.Token.  Defaults to false.
+#     token_driver keystone.token.persistence.backends.memcache_pool.Token.  Defaults to false.
 #   [enabled] If the keystone services should be enabled. Optional. Default to true.
 #   [sql_connection] Url used to connect to database.
 #   [idle_timeout] Timeout when db connections should be reaped.
diff --git a/deployment/puppet/keystone/spec/classes/keystone_spec.rb b/deployment/puppet/keystone/spec/classes/keystone_spec.rb
index 178f4fd6a3..ed9beccb48 100644
--- a/deployment/puppet/keystone/spec/classes/keystone_spec.rb
+++ b/deployment/puppet/keystone/spec/classes/keystone_spec.rb
@@ -288,7 +288,7 @@ describe 'keystone' do
       {
         'admin_token'      => 'service_token',
         'memcache_servers' => [ 'SERVER1:11211', 'SERVER2:11211' ],
-        'token_driver'     => 'keystone.token.backends.memcache.Token'
+        'token_driver'     => 'keystone.token.persistence.backends.memcache_pool.Token'
       }
     end
 
diff --git a/deployment/puppet/openstack/manifests/keystone.pp b/deployment/puppet/openstack/manifests/keystone.pp
index 5494ba0cef..e388816824 100644
--- a/deployment/puppet/openstack/manifests/keystone.pp
+++ b/deployment/puppet/openstack/manifests/keystone.pp
@@ -202,7 +202,7 @@ class openstack::keystone (
 
   if $memcache_servers {
     $memcache_servers_real = suffix($memcache_servers, inline_template(":<%= @memcache_server_port %>"))
-    $token_driver = 'keystone.token.backends.memcache.Token'
+    $token_driver = 'keystone.token.persistence.backends.memcache_pool.Token'
   } else {
     $memcache_servers_real = false
     $token_driver = 'keystone.token.backends.sql.Token'