diff --git a/src/AutoEntityLabelPermissionController.php b/src/AutoEntityLabelPermissionController.php
index c0a8635..ac0521d 100644
--- a/src/AutoEntityLabelPermissionController.php
+++ b/src/AutoEntityLabelPermissionController.php
@@ -25,23 +25,22 @@ class AutoEntityLabelPermissionController implements ContainerInjectionInterface
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
-
+  protected $entityTypeManager;
   /**
    * Constructs a new AutoEntityLabelPermissionController instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
    *   The entity manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.manager'));
+    return new static($container->get('entity_type.manager'));
   }
 
   /**
@@ -52,7 +51,7 @@ class AutoEntityLabelPermissionController implements ContainerInjectionInterface
   public function autoEntityLabelPermissions() {
     $permissions = [];
 
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       // Create a permission for each entity type to manage the entity
       // labels.
       if ($entity_type->hasLinkTemplate('auto-label') && $entity_type->hasKey('label')) {
diff --git a/src/AutoEntityLabelPermisssionController.php b/src/AutoEntityLabelPermisssionController.php
index 6b926f1..a84c6f8 100644
--- a/src/AutoEntityLabelPermisssionController.php
+++ b/src/AutoEntityLabelPermisssionController.php
@@ -8,7 +8,7 @@
 namespace Drupal\auto_entitylabel;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -22,25 +22,25 @@ class AutoEntityLabelPermisssionController implements ContainerInjectionInterfac
   /**
    * The entity manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Constructs a new AutoEntityLabelPermisssionController instance.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.manager'));
+    return new static($container->get('entity_type.manager'));
   }
 
   /**
@@ -51,7 +51,7 @@ class AutoEntityLabelPermisssionController implements ContainerInjectionInterfac
   public function autoEntityLabelPermissions() {
     $permissions = [];
 
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
         // Create a permission for each fieldable entity to manage
         // the entity labels.
         $permissions['administer ' . $entity_type_id . ' labels'] = [
diff --git a/src/Form/AutoEntityLabelForm.php b/src/Form/AutoEntityLabelForm.php
index 13d00cd..d4e36f9 100644
--- a/src/Form/AutoEntityLabelForm.php
+++ b/src/Form/AutoEntityLabelForm.php
@@ -38,7 +38,7 @@ class AutoEntityLabelForm extends ConfigFormBase {
    */
   protected $configFactory;
 
-  protected $entitymanager;
+  protected $entityTypeManager;
 
   protected $route_match;
 
@@ -48,9 +48,9 @@ class AutoEntityLabelForm extends ConfigFormBase {
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_manager, RouteMatchInterface $route_match) {
+  public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, RouteMatchInterface $route_match) {
     parent::__construct($config_factory);
-    $this->entitymanager = $entity_manager;
+    $this->entityTypeManager = $entity_type_manager;
     $this->route_match = $route_match;
     $route_options = $this->route_match->getRouteObject()->getOptions();
     $array_keys = array_keys($route_options['parameters']);
diff --git a/src/Plugin/Derivative/AutoEntityLabelConfigTask.php b/src/Plugin/Derivative/AutoEntityLabelConfigTask.php
index f4478bd..0fead6f 100644
--- a/src/Plugin/Derivative/AutoEntityLabelConfigTask.php
+++ b/src/Plugin/Derivative/AutoEntityLabelConfigTask.php
@@ -14,7 +14,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Creates an FieldUiLocalTask object.
@@ -22,8 +22,8 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
    *   The entity manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -31,7 +31,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
-      $container->get('entity.manager')
+      $container->get('entity_type.manager')
     );
   }
 
@@ -41,7 +41,7 @@ class AutoEntityLabelConfigTask extends DeriverBase implements ContainerDeriverI
   public function getDerivativeDefinitions($base_plugin_definition) {
     $this->derivatives = array();
 
-    foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
+    foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
        // Special handling of Taxonomy. See https://www.drupal.org/node/2822546
        if ($entity_type_id == "taxonomy_vocabulary") {
          $base_route = "entity.{$entity_type_id}.overview_form";
diff --git a/src/Routing/RouteEnhancer.php b/src/Routing/RouteEnhancer.php
index 0a40607..c0c0184 100644
--- a/src/Routing/RouteEnhancer.php
+++ b/src/Routing/RouteEnhancer.php
@@ -22,7 +22,7 @@ class RouteEnhancer implements RouteEnhancerInterface {
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Constructs a RouteEnhancer object.
@@ -30,15 +30,15 @@ class RouteEnhancer implements RouteEnhancerInterface {
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
    *   The entity manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
    * {@inheritdoc}
    */
   public function enhance(array $defaults, Request $request) {
-    if (($bundle = $this->entityManager->getDefinition($defaults['entity_type_id'])->getBundleEntityType()) && isset($defaults[$bundle])) {
+    if (($bundle = $this->entityTypeManager->getDefinition($defaults['entity_type_id'])->getBundleEntityType()) && isset($defaults[$bundle])) {
       // Auto Entity Label forms only need the actual name of the bundle they're dealing
       // with, not an upcasted entity object, so provide a simple way for them
       // to get it.