diff --git a/src/Form/BetterFieldDescriptionsFieldsForm.php b/src/Form/BetterFieldDescriptionsFieldsForm.php
index 8d783a8..4480f01 100644
--- a/src/Form/BetterFieldDescriptionsFieldsForm.php
+++ b/src/Form/BetterFieldDescriptionsFieldsForm.php
@@ -8,7 +8,7 @@ use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Entity\EntityFieldManager;
-use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityTypeManager;
 
 /**
  * Displays the better_field_descriptions_fields settings form.
@@ -23,19 +23,19 @@ class BetterFieldDescriptionsFieldsForm extends ConfigFormBase {
   private $entityFieldManager;
 
   /**
-   * EntityManager services object.
+   * EntityTypeManager services object.
    *
-   * @var Drupal\Core\Entity\EntityManager
+   * @var Drupal\Core\Entity\EntityTypeManager
    */
-  private $entityManager;
+  private $entityTypeManager;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManager $entityFieldManager, EntityManager $entityManager) {
+  public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManager $entityFieldManager, EntityTypeManager $entityTypeManager) {
     parent::__construct($config_factory);
     $this->entityFieldManager = $entityFieldManager;
-    $this->entityManager = $entityManager;
+    $this->entityTypeManager = $entityTypeManager;
   }
 
   /**
@@ -45,7 +45,7 @@ class BetterFieldDescriptionsFieldsForm extends ConfigFormBase {
     return new static(
       $container->get('config.factory'),
       $container->get('entity_field.manager'),
-      $container->get('entity.manager')
+      $container->get('entity_type.manager')
     );
   }
 
@@ -146,14 +146,14 @@ class BetterFieldDescriptionsFieldsForm extends ConfigFormBase {
       $fields_instances = [];
 
       // Get info on pseudo fields, like title.
-      $extra_fields = $this->entityManager->getExtraFields('node', $bundle_machine_name, 'form');
+      $extra_fields = $this->entityFieldManager->getExtraFields('node', $bundle_machine_name, 'form');
       if (isset($extra_fields['title'])) {
         $fields_instances['title'] = $extra_fields['title'];
       }
 
       // Get info on regular fields to the bundle.
-      $entityManager = $this->entityFieldManager;
-      $fields_instances += $entityManager->getFieldDefinitions('node', $bundle_machine_name);
+      $entityTypeManager = $this->entityFieldManager;
+      $fields_instances += $entityTypeManager->getFieldDefinitions('node', $bundle_machine_name);
 
       // Wrapping each bundle in a collapsed fieldset.
       $form['bundles'][$bundle_machine_name] = [
diff --git a/src/Form/BetterFieldDescriptionsSettingsForm.php b/src/Form/BetterFieldDescriptionsSettingsForm.php
index 1d02cf6..e55547f 100644
--- a/src/Form/BetterFieldDescriptionsSettingsForm.php
+++ b/src/Form/BetterFieldDescriptionsSettingsForm.php
@@ -7,7 +7,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Entity\EntityFieldManager;
-use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityTypeManager;
 
 /**
  * Displays the better_field_descriptions settings form.
@@ -22,19 +22,19 @@ class BetterFieldDescriptionsSettingsForm extends ConfigFormBase {
   private $entityFieldManager;
 
   /**
-   * EntityManager services object.
+   * EntityTypeManager services object.
    *
-   * @var Drupal\Core\Entity\EntityManager
+   * @var Drupal\Core\Entity\EntityTypeManager
    */
-  private $entityManager;
+  private $entityTypeManager;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManager $entityFieldManager, EntityManager $entityManager) {
+  public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManager $entityFieldManager, EntityTypeManager $entityTypeManager) {
     parent::__construct($config_factory);
     $this->entityFieldManager = $entityFieldManager;
-    $this->entityManager = $entityManager;
+    $this->entityTypeManager = $entityTypeManager;
   }
 
   /**
@@ -44,7 +44,7 @@ class BetterFieldDescriptionsSettingsForm extends ConfigFormBase {
     return new static(
       $container->get('config.factory'),
       $container->get('entity_field.manager'),
-      $container->get('entity.manager')
+      $container->get('entity_type.manager')
     );
   }
 
@@ -87,12 +87,14 @@ class BetterFieldDescriptionsSettingsForm extends ConfigFormBase {
       // Array to hold fields in the node.
       $fields_instances = [];
       // Get info on pseudo fields, like title.
-      $extra_fields = $this->entityManager->getExtraFields('node', $bundle_machine_name, 'form');
+      $extra_fields = $this->entityFieldManager->getExtraFields('node', $bundle_machine_name, 'form');
       if (isset($extra_fields['title'])) {
         $fields_instances['title'] = $extra_fields['title']['label'];
       }
 
       // Get info on regular fields to the bundle.
+      $entityTypeManager = $this->entityFieldManager;
+      $fields = $entityTypeManager->getFieldDefinitions('node', $bundle_machine_name);
       $entityManager = $this->entityFieldManager;
       $fields = $entityManager->getFieldDefinitions('node', $bundle_machine_name);
       foreach ($fields as $field_machine_name => $field) {