diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index a57c9c0..1ffe7c0 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -10,8 +10,8 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\MutableCacheableDependencyInterface;
-use Drupal\Core\Cache\MutableCacheableDependencyTrait;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
+use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
 use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
 
 /**
@@ -29,9 +29,9 @@
  * @see \Drupal\Core\Config\Config
  * @see \Drupal\Core\Theme\ThemeSettings
  */
-abstract class ConfigBase implements MutableCacheableDependencyInterface {
+abstract class ConfigBase implements RefinableCacheableDependencyInterface {
   use DependencySerializationTrait;
-  use MutableCacheableDependencyTrait;
+  use RefinableCacheableDependencyTrait;
 
   /**
    * The name of the configuration object.
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 67b106b..9d7b584 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -196,7 +196,7 @@ protected function doLoadMultiple(array $ids = NULL) {
 
       // Remove the self-referring cache tag that is present on Config objects,
       // a ConfigEntity doesn't need this since it will be dynamically generated
-      // in EntityInterface::getCacheTagsForInvalidation(). The cache tags are
+      // in EntityInterface::getCacheTagsToInvalidate(). The cache tags are
       // merged during rendering, and having fewer tags available improves
       // performance.
       $key = array_search('config:' . $config->getName(), $records[$id]['cacheTags']);