diff --git a/modules/paragraphs_library/paragraphs_library.install b/modules/paragraphs_library/paragraphs_library.install
index 449730f..1751ed9 100644
--- a/modules/paragraphs_library/paragraphs_library.install
+++ b/modules/paragraphs_library/paragraphs_library.install
@@ -65,7 +65,7 @@ function paragraphs_library_install() {
  */
 function paragraphs_library_update_8001() {
 
-  \Drupal::service('entity.manager')->clearCachedDefinitions();
+  \Drupal::service('entity_type.manager')->clearCachedDefinitions();
 
   // Load all library items and store their values in memory.
   $library_values = \Drupal::database()->query('SELECT * FROM {paragraphs_library_item}')->fetchAll(PDO::FETCH_ASSOC);
@@ -110,7 +110,7 @@ function paragraphs_library_update_8001() {
   $entity_definition_update_manager->installFieldStorageDefinition('langcode', $entity_type->id(), 'paragraphs_library', $langcode_field);
   $entity_definition_update_manager->installFieldStorageDefinition('default_langcode', $entity_type->id(), 'paragraphs_library', $default_langcode_field);
 
-  \Drupal::entityManager()->clearCachedDefinitions();
+  \Drupal::entityTypeManager()->clearCachedDefinitions();
   foreach ($library_values as $library_value) {
     $library_value['paragraphs'] = [
       'target_id' => $library_value['paragraphs__target_id'],
diff --git a/modules/paragraphs_library/src/Form/LibraryItemForm.php b/modules/paragraphs_library/src/Form/LibraryItemForm.php
index 7fec815..2bd248a 100644
--- a/modules/paragraphs_library/src/Form/LibraryItemForm.php
+++ b/modules/paragraphs_library/src/Form/LibraryItemForm.php
@@ -3,10 +3,10 @@
 namespace Drupal\paragraphs_library\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Component\Datetime\TimeInterface;
 
@@ -30,7 +30,7 @@ class LibraryItemForm extends ContentEntityForm {
   /**
    * Constructs a LibraryItemForm object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager.
    * @param \Drupal\Core\Messenger\MessengerInterface $messenger
    *   The messenger service.
@@ -39,8 +39,8 @@ class LibraryItemForm extends ContentEntityForm {
    * @param \Drupal\Component\Datetime\TimeInterface $time
    *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, MessengerInterface $messenger, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
-    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, MessengerInterface $messenger, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_type_manager, $entity_type_bundle_info, $time);
     $this->messenger = $messenger;
   }
 
@@ -62,7 +62,7 @@ class LibraryItemForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager'),
       $container->get('messenger'),
       $container->get('entity_type.bundle.info'),
       $container->get('datetime.time')
diff --git a/src/Feeds/Target/Paragraphs.php b/src/Feeds/Target/Paragraphs.php
index b71cd84..e025ad8 100644
--- a/src/Feeds/Target/Paragraphs.php
+++ b/src/Feeds/Target/Paragraphs.php
@@ -15,7 +15,7 @@ use Drupal\feeds\Plugin\Type\Target\ConfigurableTargetInterface;
  * @FeedsTarget(
  *   id = "paragraphs",
  *   field_types = {"entity_reference_revisions"},
- *   arguments = {"@entity.manager", "@current_user"}
+ *   arguments = {"@entity_type.manager", "@current_user"}
  * )
  */
 class Paragraphs extends Text implements ConfigurableTargetInterface {
diff --git a/src/Plugin/EntityReferenceSelection/ParagraphSelection.php b/src/Plugin/EntityReferenceSelection/ParagraphSelection.php
index e170876..66ac914 100644
--- a/src/Plugin/EntityReferenceSelection/ParagraphSelection.php
+++ b/src/Plugin/EntityReferenceSelection/ParagraphSelection.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\paragraphs\Plugin\EntityReferenceSelection;
 
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -41,7 +41,7 @@ class ParagraphSelection extends DefaultSelection {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager service.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
@@ -50,8 +50,8 @@ class ParagraphSelection extends DefaultSelection {
    * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
    *   Entity type bundle info service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, AccountInterface $current_user, EntityTypeBundleInfoInterface $entity_type_bundle_info) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_manager, $module_handler, $current_user);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, AccountInterface $current_user, EntityTypeBundleInfoInterface $entity_type_bundle_info) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $module_handler, $current_user);
 
     $this->entityTypeBundleInfo = $entity_type_bundle_info;
   }
@@ -64,7 +64,7 @@ class ParagraphSelection extends DefaultSelection {
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.manager'),
+      $container->get('entity_type.manager'),
       $container->get('module_handler'),
       $container->get('current_user'),
       $container->get('entity_type.bundle.info')
@@ -297,9 +297,9 @@ class ParagraphSelection extends DefaultSelection {
   protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') {
     $target_type = $this->configuration['target_type'];
     $handler_settings = $this->configuration['handler_settings'];
-    $entity_type = $this->entityManager->getDefinition($target_type);
+    $entity_type = $this->entityTypeManager->getDefinition($target_type);
 
-    $query = $this->entityManager->getStorage($target_type)->getQuery();
+    $query = $this->entityTypeManager->getStorage($target_type)->getQuery();
 
     // If 'target_bundles' is NULL, all bundles are referenceable, no further
     // conditions are needed.
diff --git a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
index 2312d14..dd862b2 100644
--- a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
+++ b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php
@@ -230,7 +230,7 @@ class InlineParagraphsWidget extends WidgetBase {
     $host = $items->getEntity();
     $widget_state = static::getWidgetState($parents, $field_name, $form_state);
 
-    $entity_manager = \Drupal::entityTypeManager();
+    $entity_type_manager = \Drupal::entityTypeManager();
     $target_type = $this->getFieldSetting('target_type');
 
     $item_mode = isset($widget_state['paragraphs'][$delta]['mode']) ? $widget_state['paragraphs'][$delta]['mode'] : 'edit';
@@ -260,10 +260,10 @@ class InlineParagraphsWidget extends WidgetBase {
     }
     elseif (isset($widget_state['selected_bundle'])) {
 
-      $entity_type = $entity_manager->getDefinition($target_type);
+      $entity_type = $entity_type_manager->getDefinition($target_type);
       $bundle_key = $entity_type->getKey('bundle');
 
-      $paragraphs_entity = $entity_manager->getStorage($target_type)->create(array(
+      $paragraphs_entity = $entity_type_manager->getStorage($target_type)->create(array(
         $bundle_key => $widget_state['selected_bundle'],
       ));
       $paragraphs_entity->setParentEntity($items->getEntity(), $field_name);
diff --git a/src/Plugin/migrate/source/DrupalSqlBase.php b/src/Plugin/migrate/source/DrupalSqlBase.php
index b629369..04a763e 100644
--- a/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -20,8 +20,8 @@ abstract class DrupalSqlBase extends MigrateDrupalSqlBase implements Configurabl
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_manager);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_type_manager);
     $this->setConfiguration($configuration);
   }
 
diff --git a/src/Plugin/migrate/source/d7/FieldableEntity.php b/src/Plugin/migrate/source/d7/FieldableEntity.php
index ff3e8a7..dde750a 100644
--- a/src/Plugin/migrate/source/d7/FieldableEntity.php
+++ b/src/Plugin/migrate/source/d7/FieldableEntity.php
@@ -20,8 +20,8 @@ abstract class FieldableEntity extends MigrateFieldableEntity implements Configu
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_manager);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_type_manager);
     $this->setConfiguration($configuration);
   }