diff --git a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
index 6284047..b4c21ce 100644
--- a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
+++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of CacheBackendInterface.
+ * Definition of Drupal\Core\Cache\CacheBackendInterface.
  */
 
 namespace Drupal\Core\Cache;
@@ -11,21 +11,22 @@ namespace Drupal\Core\Cache;
  * Defines an interface for cache implementations.
  *
  * All cache implementations have to implement this interface.
- * DrupalDatabaseCache provides the default implementation, which can be
- * consulted as an example.
+ * Drupal\Core\Cache\DatabaseBackend provides the default implementation, which
+ * can be consulted as an example.
  *
  * To make Drupal use your implementation for a certain cache bin, you have to
  * set a variable with the name of the cache bin as its key and the name of
  * your class as its value. For example, if your implementation of
- * DrupalCacheInterface was called MyCustomCache, the following line would make
- * Drupal use it for the 'cache_page' bin:
+ * Drupal\Core\Cache\CacheBackendInterface was called MyCustomCache, the
+ * following line would make Drupal use it for the 'cache_page' bin:
  * @code
  *  variable_set('cache_class_cache_page', 'MyCustomCache');
  * @endcode
  *
  * Additionally, you can register your cache implementation to be used by
  * default for all cache bins by setting the variable 'cache_default_class' to
- * the name of your implementation of the DrupalCacheInterface, e.g.
+ * the name of your implementation of the
+ * Drupal\Core\Cache\CacheBackendInterface, e.g.
  * @code
  *  variable_set('cache_default_class', 'MyCustomCache');
  * @endcode
@@ -42,7 +43,7 @@ namespace Drupal\Core\Cache;
  * @endcode
  *
  * @see cache()
- * @see DrupalDatabaseCache
+ * @see Drupal\Core\Cache\DatabaseBackend
  */
 interface CacheBackendInterface {
 
diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
index 7afd698..73c7139 100644
--- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of DatabaseBackend.
+ * Definition of Drupal\Core\Cache\DatabaseBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/InstallBackend.php b/core/lib/Drupal/Core/Cache/InstallBackend.php
index 8a1b177..53f9b23 100644
--- a/core/lib/Drupal/Core/Cache/InstallBackend.php
+++ b/core/lib/Drupal/Core/Cache/InstallBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of InstallBackend.
+ * Definition of Drupal\Core\Cache\InstallBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/lib/Drupal/Core/Cache/NullBackend.php b/core/lib/Drupal/Core/Cache/NullBackend.php
index af83b96..c3da5d7 100644
--- a/core/lib/Drupal/Core/Cache/NullBackend.php
+++ b/core/lib/Drupal/Core/Cache/NullBackend.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of NullBackend.
+ * Definition of Drupal\Core\Cache\NullBackend.
  */
 
 namespace Drupal\Core\Cache;
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 7b80bc5..fa6533b 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1507,7 +1507,7 @@ function system_schema() {
         'default' => 0,
       ),
       'cache' => array(
-        'description' => "The time of this user's last post. This is used when the site has specified a minimum_cache_lifetime. See DrupalCacheInterface::get().",
+        'description' => "The time of this user's last post. This is used when the site has specified a minimum_cache_lifetime. See Drupal\Core\Cache\CacheBackendInterface::get().",
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,