diff --git a/src/BundleConfigManager.php b/src/BundleConfigManager.php
index cf9c028..8dbce46 100644
--- a/src/BundleConfigManager.php
+++ b/src/BundleConfigManager.php
@@ -6,7 +6,7 @@
 
 namespace Drupal\title;
 
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Allow management of the title module config.
@@ -14,10 +14,10 @@ use Drupal\Core\Entity\EntityManagerInterface;
 class BundleConfigManager {
 
   /**
-   * @param EntityManagerInterface $entityManager
+   * @param EntityTypeManagerInterface $entityTypeManager
    */
-  public function __construct(EntityManagerInterface $entityManager) {
-    $this->entityManager = $entityManager;
+  public function __construct(EntityTypeManagerInterface $entityTypeManager) {
+    $this->entityTypeManager = $entityTypeManager;
   }
 
   /**
@@ -148,7 +148,7 @@ class BundleConfigManager {
    *   An array of view mode IDs.
    */
   public function getViewModeIds($entity_type) {
-    $view_modes = $this->entityManager->getViewModes('node');
+    $view_modes = $this->entityTypeManager->getViewModes('node');
     $ids = [];
     foreach ($view_modes as $view_mode) {
       $ids[] = str_replace($entity_type . '.', '', $view_mode['id']);
@@ -161,7 +161,7 @@ class BundleConfigManager {
    * Load the config entity which represents a bundle.
    */
   public function loadBundle($bundle) {
-    $manager = $this->entityManager;
+    $manager = $this->entityTypeManager;
     return $manager->getStorage('node_type')->load($bundle);
   }
 
@@ -177,7 +177,7 @@ class BundleConfigManager {
    *   The display config object.
    */
   public function loadDisplay($bundle, $view_mode) {
-    return $this->entityManager->getStorage('entity_view_display')
+    return $this->entityTypeManager->getStorage('entity_view_display')
       ->load('node.' . $bundle . '.' . $view_mode);
   }
 }
diff --git a/title.module b/title.module
index da7e2a6..9e1d860 100644
--- a/title.module
+++ b/title.module
@@ -127,7 +127,7 @@ function title_entity_prepare_view($entity_type_id, array $entities, array $disp
     }
     $display = $displays[$entity->bundle()];
     if (!$display->getComponent('title')) {
-      $fields = \Drupal::entityManager()->getFieldDefinitions($entity_type_id, $entity->bundle());
+      $fields = \Drupal::entityTypeManager()->getFieldDefinitions($entity_type_id, $entity->bundle());
       $options = $fields['title']->getDisplayOptions('view');
       $built_title = \Drupal::service('plugin.manager.field.formatter')->prepareConfiguration($fields['title']->getType(), $options);
       $display->setComponent('title', $built_title);