core/lib/Drupal/Core/Render/RenderCache.php              | 16 ++++++----------
 core/lib/Drupal/Core/Render/RenderCacheInterface.php     | 12 ++++++++----
 core/lib/Drupal/Core/Render/Renderer.php                 |  6 +++---
 core/modules/user/src/UserData.php                       |  2 +-
 .../Tests/Core/Render/RendererPostRenderCacheTest.php    | 10 +++++-----
 core/tests/Drupal/Tests/Core/Render/RendererTest.php     |  4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php
index 0430754..0589059 100644
--- a/core/lib/Drupal/Core/Render/RenderCache.php
+++ b/core/lib/Drupal/Core/Render/RenderCache.php
@@ -14,10 +14,6 @@
 
 /**
  * Wraps the caching logic for the render caching system.
- *
- * @see sec_caching
- *
- * @see \Drupal\Core\Render\RendererInterface
  */
 class RenderCache implements RenderCacheInterface {
 
@@ -61,7 +57,7 @@ public function __construct(RequestStack $request_stack, CacheFactoryInterface $
   /**
    * {@inheritdoc}
    */
-  public function cacheGet(array $elements) {
+  public function get(array $elements) {
     // Form submissions rely on the form being built during the POST request,
     // and render caching of forms prevents this from happening.
     // @todo remove the isMethodSafe() check when
@@ -74,10 +70,10 @@ public function cacheGet(array $elements) {
     if (!empty($cid) && ($cache_bin = $this->cacheFactory->get($bin)) && $cache = $cache_bin->get($cid)) {
       $cached_element = $cache->data;
       // Two-tier caching: redirect to actual (post-bubbling) cache item.
-      // @see \Drupal\Core\Render\Renderer::doRender()
-      // @see ::cacheSet()
+      // @see \Drupal\Core\Render\RendererInterface::render()
+      // @see ::set()
       if (isset($cached_element['#cache_redirect'])) {
-        return $this->cacheGet($cached_element);
+        return $this->get($cached_element);
       }
       // Return the cached element.
       return $cached_element;
@@ -108,8 +104,8 @@ public function cacheSet(array &$elements, array $pre_bubbling_elements) {
 
     // Two-tier caching: detect different CID post-bubbling, create redirect,
     // update redirect if different set of cache contexts.
-    // @see \Drupal\Core\Render\Renderer::doRender()
-    // @see ::cacheGet()
+    // @see \Drupal\Core\Render\RendererInterface::render()
+    // @see ::get()
     if ($pre_bubbling_cid && $pre_bubbling_cid !== $cid) {
       // The cache redirection strategy we're implementing here is pretty
       // simple in concept. Suppose we have the following render structure:
diff --git a/core/lib/Drupal/Core/Render/RenderCacheInterface.php b/core/lib/Drupal/Core/Render/RenderCacheInterface.php
index 88a0fc6..71e7bed 100644
--- a/core/lib/Drupal/Core/Render/RenderCacheInterface.php
+++ b/core/lib/Drupal/Core/Render/RenderCacheInterface.php
@@ -9,6 +9,10 @@
 
 /**
  * Defines an interface for caching rendered render arrays.
+ *
+ * @see sec_caching
+ *
+ * @see \Drupal\Core\Render\RendererInterface
  */
 interface RenderCacheInterface {
 
@@ -42,10 +46,10 @@ public function getCacheableRenderArray(array $elements);
    *   A renderable array, with the original element and all its children pre-
    *   rendered, or FALSE if no cached copy of the element is available.
    *
-   * @see \Drupal\Core\Render\Renderer::doRender()
-   * @see ::cacheSet()
+   * @see \Drupal\Core\Render\RendererInterface::render()
+   * @see ::get()
    */
-  public function cacheGet(array $elements);
+  public function get(array $elements);
 
   /**
    * Caches the rendered output of a renderable array.
@@ -66,7 +70,7 @@ public function cacheGet(array $elements);
    * @return bool|null
    *  Returns FALSE if no cache item could be created, NULL otherwise.
    *
-   * @see ::cacheSet()
+   * @see ::set()
    */
   public function cacheSet(array &$elements, array $pre_bubbling_elements);
 
diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php
index 5fabdb8..2a6ca10 100644
--- a/core/lib/Drupal/Core/Render/Renderer.php
+++ b/core/lib/Drupal/Core/Render/Renderer.php
@@ -173,7 +173,7 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
     // Try to fetch the prerendered element from cache, run any
     // #post_render_cache callbacks and return the final markup.
     if (isset($elements['#cache']['keys'])) {
-      $cached_element = $this->renderCache->cacheGet($elements);
+      $cached_element = $this->renderCache->get($elements);
       if ($cached_element !== FALSE) {
         $elements = $cached_element;
         // Only when we're not in a root (non-recursive) drupal_render() call,
@@ -194,8 +194,8 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
     }
     // Two-tier caching: track pre-bubbling elements' #cache for later
     // comparison.
-    // @see \Drupal\Core\Render\RenderCacheInterface::cacheGet()
-    // @see \Drupal\Core\Render\RenderCacheInterface::cacheSet()
+    // @see \Drupal\Core\Render\RenderCacheInterface::get()
+    // @see \Drupal\Core\Render\RenderCacheInterface::set()
     $pre_bubbling_elements = [];
     $pre_bubbling_elements['#cache'] = isset($elements['#cache']) ? $elements['#cache'] : [];
 
diff --git a/core/modules/user/src/UserData.php b/core/modules/user/src/UserData.php
index 3f6b593..f2d0cd5 100644
--- a/core/modules/user/src/UserData.php
+++ b/core/modules/user/src/UserData.php
@@ -12,7 +12,7 @@
 /**
  * Defines the user data service.
  */
-class UserData implements UserDataInterface {
+class setUserData implements UserDataInterface {
 
   /**
    * The database connection to use.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php
index 9223a10..43e2d91 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPostRenderCacheTest.php
@@ -71,7 +71,7 @@ public function testPostRenderCacheWithCacheDisabled() {
   /**
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers \Drupal\Core\Render\RenderCache::cacheSet
    * @covers \Drupal\Core\Render\RenderCache::createCacheID
    */
@@ -127,7 +127,7 @@ public function testPostRenderCacheWithColdCache() {
   /**
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers ::processPostRenderCache
    */
   public function testPostRenderCacheWithPostRequest() {
@@ -189,7 +189,7 @@ public function testRenderRecursivePostRenderCache() {
    *
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers ::processPostRenderCache
    */
   public function testRenderChildrenPostRenderCacheDifferentContexts() {
@@ -284,7 +284,7 @@ public function testRenderChildrenPostRenderCacheDifferentContexts() {
    *
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers ::processPostRenderCache
    */
   public function testRenderChildrenPostRenderCacheComplex() {
@@ -404,7 +404,7 @@ public function testRenderChildrenPostRenderCacheComplex() {
    *
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers ::processPostRenderCache
    * @covers ::generateCachePlaceholder
    */
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index d61dec2..0f7a47a 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -531,7 +531,7 @@ public function testRenderWithThemeArguments() {
   /**
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers \Drupal\Core\Render\RenderCache::cacheSet
    * @covers \Drupal\Core\Render\RenderCache::createCacheID
    */
@@ -584,7 +584,7 @@ public function testRenderCache() {
   /**
    * @covers ::render
    * @covers ::doRender
-   * @covers \Drupal\Core\Render\RenderCache::cacheGet
+   * @covers \Drupal\Core\Render\RenderCache::get
    * @covers \Drupal\Core\Render\RenderCache::cacheSet
    * @covers \Drupal\Core\Render\RenderCache::createCacheID
    *