diff --git a/config_update_ui/config_update_ui.module b/config_update_ui/config_update_ui.module
index 2b8fda2..4584343 100644
--- a/config_update_ui/config_update_ui.module
+++ b/config_update_ui/config_update_ui.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_help().
@@ -19,7 +20,7 @@ function config_update_ui_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Checking for configuration differences') . '</dd>';
-      $output .= '<dd>' . t('The <a href="!report">Updates report</a> shows you configuration that differs between your site\'s active configuration and the installed modules, themes, and install profile. Choose a particular configuration type (or All), or run the report for a particular module, theme, or your install profile.', array('!report' => \Drupal::url('config_update_ui.report'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href="!report">Updates report</a> shows you configuration that differs between your site\'s active configuration and the installed modules, themes, and install profile. Choose a particular configuration type (or All), or run the report for a particular module, theme, or your install profile.', array('!report' => Url::fromRoute('config_update_ui.report')->toString())) . '</dd>';
       $output .= '</dl>';
       return $output;
 
diff --git a/src/ConfigLister.php b/src/ConfigLister.php
index c5865f0..c803a6b 100644
--- a/src/ConfigLister.php
+++ b/src/ConfigLister.php
@@ -8,7 +8,7 @@ namespace Drupal\config_update;
 
 use Drupal\Core\Config\ExtensionInstallStorage;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Extension\Extension;
 
@@ -75,7 +75,7 @@ class ConfigLister implements ConfigListInterface {
    * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
    *   The extension config storage for optional config items.
    */
-  public function __construct(EntityManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
+  public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
     $this->entityManager = $entity_manager;
     $this->activeConfigStorage = $active_config_storage;
     $this->extensionConfigStorage = $extension_config_storage;
diff --git a/src/ConfigReverter.php b/src/ConfigReverter.php
index 8c73eb7..fb2db3f 100644
--- a/src/ConfigReverter.php
+++ b/src/ConfigReverter.php
@@ -8,8 +8,7 @@ namespace Drupal\config_update;
 
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Site\Settings;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -79,7 +78,7 @@ class ConfigReverter implements ConfigRevertInterface {
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
    *   The event dispatcher.
    */
-  public function __construct(EntityManagerInterface $entity_manager, StorageInterface $active_config_storage, StorageInterface $extension_config_storage, StorageInterface $extension_optional_config_storage, ConfigFactoryInterface $config_factory, EventDispatcherInterface $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;
     $this->activeConfigStorage = $active_config_storage;
     $this->extensionConfigStorage = $extension_config_storage;