diff --git a/src/Plugin/Field/FieldFormatter/TextimageImageFieldFormatter.php b/src/Plugin/Field/FieldFormatter/TextimageImageFieldFormatter.php
index bf3d3de..680eb80 100644
--- a/src/Plugin/Field/FieldFormatter/TextimageImageFieldFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/TextimageImageFieldFormatter.php
@@ -76,7 +76,7 @@ class TextimageImageFieldFormatter extends ImageFormatter {
       $configuration['view_mode'],
       $configuration['third_party_settings'],
       $container->get('current_user'),
-      $container->get('entity.manager')->getStorage('image_style'),
+      $container->get('entity_type.manager')->getStorage('image_style'),
       $container->get('textimage.factory')
     );
   }
diff --git a/src/Plugin/Field/FieldFormatter/TextimageTextFieldFormatter.php b/src/Plugin/Field/FieldFormatter/TextimageTextFieldFormatter.php
index d459f86..9895bc0 100644
--- a/src/Plugin/Field/FieldFormatter/TextimageTextFieldFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/TextimageTextFieldFormatter.php
@@ -110,7 +110,7 @@ class TextimageTextFieldFormatter extends FormatterBase implements ContainerFact
       $configuration['third_party_settings'],
       $container->get('current_user'),
       $container->get('textimage.factory'),
-      $container->get('entity.manager')->getStorage('image_style'),
+      $container->get('entity_type.manager')->getStorage('image_style'),
       $container->get('textimage.logger')
     );
   }
diff --git a/src/TextimageFactory.php b/src/TextimageFactory.php
index 25abb42..b6c49ba 100644
--- a/src/TextimageFactory.php
+++ b/src/TextimageFactory.php
@@ -4,7 +4,7 @@ namespace Drupal\textimage;
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Session\AccountInterface;
@@ -84,17 +84,17 @@ class TextimageFactory implements TextimageFactoryInterface {
    *   The current user.
    * @param \Drupal\Core\StreamWrapper\StreamWrapperManager $stream_wrapper_manager
    *   The stream wrapper manager service.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The image style entity storage.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Token $token_service, LoggerInterface $logger, CacheBackendInterface $cache_service, AccountInterface $current_user, StreamWrapperManager $stream_wrapper_manager, EntityManagerInterface $entity_manager) {
+  public function __construct(ConfigFactoryInterface $config_factory, Token $token_service, LoggerInterface $logger, CacheBackendInterface $cache_service, AccountInterface $current_user, StreamWrapperManager $stream_wrapper_manager, EntityTypeManagerInterface $entity_type_manager) {
     $this->configFactory = $config_factory;
     $this->token = $token_service;
     $this->logger = $logger;
     $this->cache = $cache_service;
     $this->currentUser = $current_user;
     $this->streamWrapperManager = $stream_wrapper_manager;
-    $this->userStorage = $entity_manager->getStorage('user');
+    $this->userStorage = $entity_type_manager->getStorage('user');
   }
 
   /**
diff --git a/textimage.services.yml b/textimage.services.yml
index 06dd7c1..feca68e 100644
--- a/textimage.services.yml
+++ b/textimage.services.yml
@@ -15,7 +15,7 @@ services:
     arguments: ['textimage']
   textimage.factory:
     class: Drupal\textimage\TextimageFactory
-    arguments: ['@config.factory', '@token', '@textimage.logger', '@cache.textimage', '@current_user', '@stream_wrapper_manager', '@entity.manager']
+    arguments: ['@config.factory', '@token', '@textimage.logger', '@cache.textimage', '@current_user', '@stream_wrapper_manager', '@entity_type.manager']
   textimage.logger:
     class: Drupal\textimage\TextimageLogger
     arguments: ['@config.factory', '@logger.channel.textimage', '@current_user']