diff -u b/src/ConfigLister.php b/src/ConfigLister.php
--- b/src/ConfigLister.php
+++ b/src/ConfigLister.php
@@ -38,9 +38,9 @@
   /**
    * The entity manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * The active config storage.
@@ -66,7 +66,7 @@
   /**
    * Constructs a ConfigLister.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager.
    * @param \Drupal\Core\Config\StorageInterface $active_config_storage
    *   The active config storage.
@@ -75,8 +75,8 @@
    * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
    *   The extension config storage for optional config items.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->activeConfigStorage = $active_config_storage;
     $this->extensionConfigStorage = $extension_config_storage;
     $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
@@ -90,7 +90,7 @@
       return $this->definitions;
     }
 
-    foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type => $definition) {
       if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
         $this->definitions[$entity_type] = $definition;
         $prefix = $definition->getConfigPrefix();
diff -u b/src/ConfigReverter.php b/src/ConfigReverter.php
--- b/src/ConfigReverter.php
+++ b/src/ConfigReverter.php
@@ -23,9 +23,9 @@
   /**
    * The entity manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * The active config storage.
@@ -65,7 +65,7 @@
   /**
    * Constructs a ConfigReverter.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager.
    * @param \Drupal\Core\Config\StorageInterface $active_config_storage
    *   The active config storage.
@@ -78,8 +78,8 @@
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
    *   The event dispatcher.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, StorageInterface $extension_config_storage, StorageInterface $extension_optional_config_storage, ConfigFactoryInterface $config_factory, EventDispatcherInterface $dispatcher) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, StorageInterface $active_config_storage, StorageInterface $extension_config_storage, StorageInterface $extension_optional_config_storage, ConfigFactoryInterface $config_factory, EventDispatcherInterface $dispatcher) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->activeConfigStorage = $active_config_storage;
     $this->extensionConfigStorage = $extension_config_storage;
     $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
@@ -106,7 +106,7 @@
       $this->configFactory->getEditable($full_name)->setData($value)->save();
     }
     else {
-      $entity_storage = $this->entityManager->getStorage($type);
+      $entity_storage = $this->entityTypeManager->getStorage($type);
       $entity = $entity_storage->createFromStorageRecord($value);
       $entity->save();
     }
@@ -139,11 +139,11 @@
     else {
       // Load the current config entity and replace the value, with the
       // old UUID.
-      $definition = $this->entityManager->getDefinition($type);
+      $definition = $this->entityTypeManager->getDefinition($type);
       $id_key = $definition->getKey('id');
 
       $id = $value[$id_key];
-      $entity_storage = $this->entityManager->getStorage($type);
+      $entity_storage = $this->entityTypeManager->getStorage($type);
       $entity = $entity_storage->load($id);
       $uuid = $entity->get('uuid');
       $entity = $entity_storage->updateFromStorageRecord($entity, $value);
@@ -194,7 +194,7 @@
       return $name;
     }
 
-    $definition = $this->entityManager->getDefinition($type);
+    $definition = $this->entityTypeManager->getDefinition($type);
     $prefix = $definition->getConfigPrefix() . '.';
     return $prefix . $name;
   }