diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php
index 33d955cbd5055dac24a9c69bd543f9c8fa8db0e0..eddfc274faf32930ec829122da612abf32626bab 100644
--- a/core/lib/Drupal/Core/Utility/CacheArray.php
+++ b/core/lib/Drupal/Core/Utility/CacheArray.php
@@ -22,9 +22,9 @@
  * static caches of that same data.
  *
  * Note that array_* functions do not work with ArrayAccess. Systems using
- * DrupalCacheArray should use this only internally. If providing API functions
+ * CacheArray should use this only internally. If providing API functions
  * that return the full array, this can be cached separately or returned
- * directly. However since DrupalCacheArray holds partial content by design, it
+ * directly. However since CacheArray holds partial content by design, it
  * should be a normal PHP array or otherwise contain the full structure.
  *
  * Note also that due to limitations in PHP prior to 5.3.4, it is impossible to
@@ -102,7 +102,7 @@ abstract class CacheArray implements ArrayAccess {
   protected $storage = array();
 
   /**
-   * Constructs a DrupalCacheArray object.
+   * Constructs a CacheArray object.
    *
    * @param string $cid
    *   The cid for the array being cached.
@@ -212,7 +212,7 @@ protected function set($data, $lock = TRUE) {
   }
 
   /**
-   * Destructs the DrupalCacheArray object.
+   * Destructs the CacheArray object.
    */
   public function __destruct() {
     $data = array();
diff --git a/core/lib/Drupal/Core/Utility/ModuleInfo.php b/core/lib/Drupal/Core/Utility/ModuleInfo.php
index e5391f253b09a27ec5571a46377e2bd66afa0ca7..53219c3f54abfb17c5874f77a98a1f5204c98889 100644
--- a/core/lib/Drupal/Core/Utility/ModuleInfo.php
+++ b/core/lib/Drupal/Core/Utility/ModuleInfo.php
@@ -22,7 +22,7 @@ class ModuleInfo extends CacheArray {
   protected $info;
 
   /**
-   * Overrides DrupalCacheArray::resolveCacheMiss().
+   * Overrides CacheArray::resolveCacheMiss().
    */
   function resolveCacheMiss($offset) {
     $data = array();
diff --git a/core/lib/Drupal/Core/Utility/SchemaCache.php b/core/lib/Drupal/Core/Utility/SchemaCache.php
index 5bbd96f93f0e05c5bd14fe9ea9bb7bd2c4f06fda..b942bed163ed20462276d2aa2f70c5824d244345 100644
--- a/core/lib/Drupal/Core/Utility/SchemaCache.php
+++ b/core/lib/Drupal/Core/Utility/SchemaCache.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Utility\CacheArray;
 
 /**
- * Extends DrupalCacheArray to allow for dynamic building of the schema cache.
+ * Extends CacheArray to allow for dynamic building of the schema cache.
  */
 class SchemaCache extends CacheArray {
 
@@ -23,7 +23,7 @@ public function __construct() {
   }
 
   /**
-   * Overrides DrupalCacheArray::resolveCacheMiss().
+   * Overrides CacheArray::resolveCacheMiss().
    */
   protected function resolveCacheMiss($offset) {
     $complete_schema = drupal_get_complete_schema();
diff --git a/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
index 64d7df3db9bcb4c4674f9f437b729d3f8fb89752..a63eeb0f27e6f00aced2426089d8b48700545ac5 100644
--- a/core/lib/Drupal/Core/Utility/ThemeRegistry.php
+++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php
@@ -12,7 +12,7 @@
 /**
  * Builds the run-time theme registry.
  *
- * Extends DrupalCacheArray to allow the theme registry to be accessed as a
+ * Extends CacheArray to allow the theme registry to be accessed as a
  * complete registry, while internally caching only the parts of the registry
  * that are actually in use on the site. On cache misses the complete
  * theme registry is loaded and used to update the run-time cache.
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php b/core/modules/locale/lib/Drupal/locale/LocaleLookup.php
index 9dd04f63b80b4fa9af868a3c4ffff35873dd048c..d3a1e7b3849925e54ab02cc6f601f35bd92b274e 100644
--- a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php
+++ b/core/modules/locale/lib/Drupal/locale/LocaleLookup.php
@@ -51,7 +51,7 @@ public function __construct($langcode, $context, $stringStorage) {
   }
 
   /**
-   * Overrides DrupalCacheArray::resolveCacheMiss().
+   * Overrides CacheArray::resolveCacheMiss().
    */
   protected function resolveCacheMiss($offset) {
     $translation = $this->stringStorage->findTranslation(array(