diff --git a/core/modules/node/node.services.yml b/core/modules/node/node.services.yml
index 96b232a..0a5bcc9 100644
--- a/core/modules/node/node.services.yml
+++ b/core/modules/node/node.services.yml
@@ -30,7 +30,7 @@ services:
       - { name: event_subscriber }
   node_preview:
     class: Drupal\node\ParamConverter\NodePreviewConverter
-    arguments: ['@user.foo_tempstore']
+    arguments: ['@user.user_tempstore']
     tags:
       - { name: paramconverter }
   node.page_cache_request_policy.deny_node_preview:
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 8e88166..c9e0976 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\user\Entity\User;
-use Drupal\user\FooTempStoreFactory;
+use Drupal\user\UserTempStoreFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -23,7 +23,7 @@ class NodeForm extends ContentEntityForm {
   /**
    * The tempstore factory.
    *
-   * @var \Drupal\user\FooTempStoreFactory
+   * @var \Drupal\user\UserTempStoreFactory
    */
   protected $tempStoreFactory;
 
@@ -40,7 +40,7 @@ class NodeForm extends ContentEntityForm {
    * @param \Drupal\user\TempStoreFactory $temp_store_factory
    *   The factory for the temp store object.
    */
-  public function __construct(EntityManagerInterface $entity_manager, FooTempStoreFactory $temp_store_factory) {
+  public function __construct(EntityManagerInterface $entity_manager, UserTempStoreFactory $temp_store_factory) {
     parent::__construct($entity_manager);
     $this->tempStoreFactory = $temp_store_factory;
   }
@@ -51,7 +51,7 @@ public function __construct(EntityManagerInterface $entity_manager, FooTempStore
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
-      $container->get('user.foo_tempstore')
+      $container->get('user.user_tempstore')
     );
   }
 
diff --git a/core/modules/node/src/ParamConverter/NodePreviewConverter.php b/core/modules/node/src/ParamConverter/NodePreviewConverter.php
index a3d4d39..ac3e476 100644
--- a/core/modules/node/src/ParamConverter/NodePreviewConverter.php
+++ b/core/modules/node/src/ParamConverter/NodePreviewConverter.php
@@ -8,7 +8,7 @@
 namespace Drupal\node\ParamConverter;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\user\FooTempStoreFactory;
+use Drupal\user\UserTempStoreFactory;
 use Symfony\Component\Routing\Route;
 use Drupal\Core\ParamConverter\ParamConverterInterface;
 
@@ -20,7 +20,7 @@ class NodePreviewConverter implements ParamConverterInterface {
   /**
    * Stores the tempstore factory.
    *
-   * @var \Drupal\user\FooTempStoreFactory
+   * @var \Drupal\user\UserTempStoreFactory
    */
   protected $tempStoreFactory;
 
@@ -30,7 +30,7 @@ class NodePreviewConverter implements ParamConverterInterface {
    * @param \Drupal\user\TempStoreFactory $temp_store_factory
    *   The factory for the temp store object.
    */
-  public function __construct(FooTempStoreFactory $temp_store_factory) {
+  public function __construct(UserTempStoreFactory $temp_store_factory) {
     $this->tempStoreFactory = $temp_store_factory;
   }
 
diff --git a/core/modules/quickedit/src/Form/QuickEditFieldForm.php b/core/modules/quickedit/src/Form/QuickEditFieldForm.php
index 6193932..632748d 100644
--- a/core/modules/quickedit/src/Form/QuickEditFieldForm.php
+++ b/core/modules/quickedit/src/Form/QuickEditFieldForm.php
@@ -16,7 +16,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\user\FooTempStoreFactory;
+use Drupal\user\UserTempStoreFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -27,7 +27,7 @@ class QuickEditFieldForm extends FormBase {
   /**
    * Stores the tempstore factory.
    *
-   * @var \Drupal\user\FooTempStoreFactory
+   * @var \Drupal\user\UserTempStoreFactory
    */
   protected $tempStoreFactory;
 
@@ -48,14 +48,14 @@ class QuickEditFieldForm extends FormBase {
   /**
    * Constructs a new EditFieldForm.
    *
-   * @param \Drupal\user\FooTempStoreFactory $temp_store_factory
+   * @param \Drupal\user\UserTempStoreFactory $temp_store_factory
    *   The tempstore factory.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
    * @param \Drupal\Core\Entity\EntityStorageInterface $node_type_storage
    *   The node type storage.
    */
-  public function __construct(FooTempStoreFactory $temp_store_factory, ModuleHandlerInterface $module_handler, EntityStorageInterface $node_type_storage) {
+  public function __construct(UserTempStoreFactory $temp_store_factory, ModuleHandlerInterface $module_handler, EntityStorageInterface $node_type_storage) {
     $this->moduleHandler = $module_handler;
     $this->nodeTypeStorage = $node_type_storage;
     $this->tempStoreFactory = $temp_store_factory;
@@ -66,7 +66,7 @@ public function __construct(FooTempStoreFactory $temp_store_factory, ModuleHandl
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.foo_tempstore'),
+      $container->get('user.user_tempstore'),
       $container->get('module_handler'),
       $container->get('entity.manager')->getStorage('node_type')
     );
diff --git a/core/modules/quickedit/src/QuickEditController.php b/core/modules/quickedit/src/QuickEditController.php
index 62b18ae..212f3b7 100644
--- a/core/modules/quickedit/src/QuickEditController.php
+++ b/core/modules/quickedit/src/QuickEditController.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Form\FormState;
-use Drupal\user\FooTempStoreFactory;
+use Drupal\user\UserTempStoreFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,7 +29,7 @@ class QuickEditController extends ControllerBase {
   /**
    * The TempStore factory.
    *
-   * @var \Drupal\user\FooTempStoreFactory
+   * @var \Drupal\user\UserTempStoreFactory
    */
   protected $tempStoreFactory;
 
@@ -50,14 +50,14 @@ class QuickEditController extends ControllerBase {
   /**
    * Constructs a new QuickEditController.
    *
-   * @param \Drupal\user\FooTempStoreFactory $temp_store_factory
+   * @param \Drupal\user\UserTempStoreFactory $temp_store_factory
    *   The TempStore factory.
    * @param \Drupal\quickedit\MetadataGeneratorInterface $metadata_generator
    *   The in-place editing metadata generator.
    * @param \Drupal\quickedit\EditorSelectorInterface $editor_selector
    *   The in-place editor selector.
    */
-  public function __construct(FooTempStoreFactory $temp_store_factory, MetadataGeneratorInterface $metadata_generator, EditorSelectorInterface $editor_selector) {
+  public function __construct(UserTempStoreFactory $temp_store_factory, MetadataGeneratorInterface $metadata_generator, EditorSelectorInterface $editor_selector) {
     $this->tempStoreFactory = $temp_store_factory;
     $this->metadataGenerator = $metadata_generator;
     $this->editorSelector = $editor_selector;
@@ -68,7 +68,7 @@ public function __construct(FooTempStoreFactory $temp_store_factory, MetadataGen
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('user.foo_tempstore'),
+      $container->get('user.user_tempstore'),
       $container->get('quickedit.metadata.generator'),
       $container->get('quickedit.editor.selector')
     );
diff --git a/core/modules/user/src/FooTempStore.php b/core/modules/user/src/UserTempStore.php
similarity index 93%
rename from core/modules/user/src/FooTempStore.php
rename to core/modules/user/src/UserTempStore.php
index 838d633..2bc8dea 100644
--- a/core/modules/user/src/FooTempStore.php
+++ b/core/modules/user/src/UserTempStore.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\FooTempStore.
+ * Contains Drupal\user\UserTempStore.
  */
 
 namespace Drupal\user;
@@ -16,23 +16,23 @@
 /**
  * Stores and retrieves temporary data for a given owner.
  *
- * A FooTempStore can be used to make temporary, non-cache data available
- * across requests. The data for the FooTempStore is stored in one
- * key/value collection. FooTempStore data expires automatically after a
+ * A UserTempStore can be used to make temporary, non-cache data available
+ * across requests. The data for the UserTempStore is stored in one
+ * key/value collection. UserTempStore data expires automatically after a
  * given timeframe.
  *
- * The FooTempStore is different from a cache, because the data in it is not yet
- * saved permanently and so it cannot be rebuilt. Typically, the FooTempStore
+ * The UserTempStore is different from a cache, because the data in it is not yet
+ * saved permanently and so it cannot be rebuilt. Typically, the UserTempStore
  * might be used to store work in progress that is later saved permanently
  * elsewhere, e.g. autosave data, multistep forms, or in-progress changes
  * to complex configuration that are not ready to be saved.
  *
- * The FooTempStore differs from the TempStore in that all keys are
+ * The UserTempStore differs from the TempStore in that all keys are
  * ensured to be unique for a particular user and users can never share data. If
  * you want to be able to share data between users or use the tempStore for
  * locking use \Drupal\user\TempStore.
  */
-class FooTempStore {
+class UserTempStore {
 
   /**
    * The key/value storage object used for this data.
diff --git a/core/modules/user/src/FooTempStoreFactory.php b/core/modules/user/src/UserTempStoreFactory.php
similarity index 88%
rename from core/modules/user/src/FooTempStoreFactory.php
rename to core/modules/user/src/UserTempStoreFactory.php
index aeecd7b..7e16eb2 100644
--- a/core/modules/user/src/FooTempStoreFactory.php
+++ b/core/modules/user/src/UserTempStoreFactory.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\user\FooTempStoreFactory.
+ * Definition of Drupal\user\UserTempStoreFactory.
  */
 
 namespace Drupal\user;
@@ -13,9 +13,9 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Creates a FooTempStore object for a given collecton.
+ * Creates a UserTempStore object for a given collecton.
  */
-class FooTempStoreFactory {
+class UserTempStoreFactory {
 
   /**
    * The storage factory creating the backend to store the data.
@@ -71,7 +71,7 @@ function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBac
   }
 
   /**
-   * Creates a FooTempStore.
+   * Creates a UserTempStore.
    *
    * @param string $collection
    *   The collection name to use for this key/value store. This is typically
@@ -83,7 +83,7 @@ function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBac
   function get($collection) {
     // Store the data for this collection in the database.
     $storage = $this->storageFactory->get("user.tempstore.$collection");
-    return new FooTempStore($storage, $this->lockBackend, $this->currentUser, $this->requestStack, $this->expire);
+    return new UserTempStore($storage, $this->lockBackend, $this->currentUser, $this->requestStack, $this->expire);
   }
 
 }
diff --git a/core/modules/user/tests/src/Unit/FooTempStoreTest.php b/core/modules/user/tests/src/Unit/UserTempStoreTest.php
similarity index 95%
rename from core/modules/user/tests/src/Unit/FooTempStoreTest.php
rename to core/modules/user/tests/src/Unit/UserTempStoreTest.php
index d2f1762..89b806f 100644
--- a/core/modules/user/tests/src/Unit/FooTempStoreTest.php
+++ b/core/modules/user/tests/src/Unit/UserTempStoreTest.php
@@ -2,20 +2,20 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\user\Unit\FooTempStoreTest.
+ * Contains \Drupal\Tests\user\Unit\UserTempStoreTest.
  */
 
 namespace Drupal\Tests\user\Unit;
 
 use Drupal\Tests\UnitTestCase;
-use Drupal\user\FooTempStore;
+use Drupal\user\UserTempStore;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * @coversDefaultClass \Drupal\user\FooTempStore
+ * @coversDefaultClass \Drupal\user\UserTempStore
  * @group user
  */
-class FooTempStoreTest extends UnitTestCase {
+class UserTempStoreTest extends UnitTestCase {
 
   /**
    * The mock key value expirable backend.
@@ -34,7 +34,7 @@ class FooTempStoreTest extends UnitTestCase {
   /**
    * The user temp store.
    *
-   * @var \Drupal\user\FooTempStore
+   * @var \Drupal\user\UserTempStore
    */
   protected $tempStore;
 
@@ -81,7 +81,7 @@ protected function setUp() {
 
     $this->requestStack = new RequestStack();
 
-    $this->tempStore = new FooTempStore($this->keyValue, $this->lock, $this->currentUser, $this->requestStack, 604800);
+    $this->tempStore = new UserTempStore($this->keyValue, $this->lock, $this->currentUser, $this->requestStack, 604800);
 
     $this->ownObject = (object) array(
       'data' => 'test_data',
@@ -280,4 +280,3 @@ public function testDelete() {
   }
 
 }
-
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index d508d30..8274099 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -63,8 +63,8 @@ services:
     arguments: ['@keyvalue.expirable', '@lock', '%user.tempstore.expire%']
     tags:
       - { name: backend_overridable }
-  user.foo_tempstore:
-    class: Drupal\user\FooTempStoreFactory
+  user.user_tempstore:
+    class: Drupal\user\UserTempStoreFactory
     arguments: ['@keyvalue.expirable', '@lock', '@current_user', '@request_stack', '%user.tempstore.expire%']
     tags:
       - { name: backend_overridable }