diff --git a/core/lib/Drupal/Core/Cache/MutableCacheableDependencyTrait.php b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php
similarity index 89%
rename from core/lib/Drupal/Core/Cache/MutableCacheableDependencyTrait.php
rename to core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php
index 9fd0143..d98e08d 100644
--- a/core/lib/Drupal/Core/Cache/MutableCacheableDependencyTrait.php
+++ b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Cache\MutableCacheableDependencyTrait.
+ * Contains \Drupal\Core\Cache\RefinableCacheableDependencyTrait.
  */
 
 namespace Drupal\Core\Cache;
@@ -10,7 +10,7 @@
 /**
  * Trait for \Drupal\Core\Cache\RefinableCacheableDependencyInterface.
  */
-trait MutableCacheableDependencyTrait {
+trait RefinableCacheableDependencyTrait {
 
   /**
    * Cache contexts.
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 7e21e4a..8d5e9e3 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\MutableCacheableDependencyTrait;
+use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
@@ -25,7 +25,7 @@
  */
 abstract class Entity implements EntityInterface {
 
-  use MutableCacheableDependencyTrait;
+  use RefinableCacheableDependencyTrait;
 
   use DependencySerializationTrait {
     __sleep as traitSleep;
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index c5b2eeb..6bedc92 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -357,7 +357,7 @@ public function getOriginalId();
    * @return string[]
    *   Set of cache tags.
    *
-   * @see \Drupal\Core\Cache\MutableCacheableDependencyInterface::addCacheTags()
+   * @see \Drupal\Core\Cache\RefinableCacheableDependencyInterface::addCacheTags()
    * @see \Drupal\Core\Cache\CacheableDependencyInterface::getCacheTags()
    */
   public function getCacheTagsToInvalidate();
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index 85304f5..16a5700 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -499,7 +499,7 @@ public function testCacheTags() {
     $this->assertEquals([$this->entityTypeId . ':' . 1], $this->entity->getCacheTagsToInvalidate());
 
     // Add an additional cache tag and make sure only getCacheTags() returns
-    // tha.
+    // that.
     $this->entity->addCacheTags(['additional_cache_tag']);
 
     $this->assertEquals(['additional_cache_tag', $this->entityTypeId . ':' . 1], $this->entity->getCacheTags());
@@ -518,7 +518,7 @@ public function testCacheContexts() {
     $container->set('cache_contexts_manager', $cache_contexts_manager);
     \Drupal::setContainer($container);
 
-    // There are no cache contexts by defaut.
+    // There are no cache contexts by default.
     $this->assertEquals([], $this->entity->getCacheContexts());
 
     // Add an additional cache context.
@@ -526,7 +526,6 @@ public function testCacheContexts() {
     $this->assertEquals(['user'], $this->entity->getCacheContexts());
   }
 
-
   /**
    * @covers ::getCacheMaxAge
    * @covers ::setCacheMaxAgeIfLower