diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index ce6f609..5179b86 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -205,12 +205,14 @@ protected function addChangelistUpdate() {
    */
   protected function addChangelistRename() {
     // Renames will be present in both create and delete lists.
-    if (empty($this->getChangelist('create')) || empty($this->getChangelist('delete'))) {
+    $create_list = $this->getChangelist('create');
+    $delete_list = $this->getChangelist('delete');
+    if (empty($create_list) || empty($delete_list)) {
       return;
     }
 
     $create_uuids = array();
-    foreach ($this->getSourceStorage()->readMultiple($this->getChangelist('create')) as $id => $data) {
+    foreach ($this->getSourceStorage()->readMultiple($create_list) as $id => $data) {
       if (isset($data['uuid'])) {
         $create_uuids[$data['uuid']] = $id;
       }
@@ -220,7 +222,7 @@ protected function addChangelistRename() {
     }
 
     $renames = array();
-    foreach ($this->getTargetStorage()->readMultiple($this->getChangelist('delete')) as $id => $data) {
+    foreach ($this->getTargetStorage()->readMultiple($delete_list) as $id => $data) {
       if (isset($data['uuid']) && isset($create_uuids[$data['uuid']])) {
         $renames[] = $id . '::' . $create_uuids[$data['uuid']];
         $this->removeFromChangelistsByUuid($data['uuid']);