diff --git a/modules/recurring_events_registration/src/RegistrantListBuilder.php b/modules/recurring_events_registration/src/RegistrantListBuilder.php
index 5d0fdb4f71476b97b3ea713f7c68ecf6a44e00eb..7fc6fb04e277a17c96a147a5c13c38afe7d79ea5 100644
--- a/modules/recurring_events_registration/src/RegistrantListBuilder.php
+++ b/modules/recurring_events_registration/src/RegistrantListBuilder.php
@@ -47,7 +47,7 @@ class RegistrantListBuilder extends EntityListBuilder {
   protected $entityFieldManager;
 
   /**
-   * Constructs a new EventInstanceListBuilder object.
+   * Constructs a new RegistrantListBuilder object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
@@ -79,7 +79,7 @@ class RegistrantListBuilder extends EntityListBuilder {
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('config.factory'),
       $container->get('request_stack'),
       $container->get('recurring_events_registration.creation_service'),
diff --git a/src/EventInstanceListBuilder.php b/src/EventInstanceListBuilder.php
index 8d75f8fba0465ecebc81e929eb1b876fb8a9ea52..599a2d498c450c0c0c95eb98d06ea18c7b92bfbd 100644
--- a/src/EventInstanceListBuilder.php
+++ b/src/EventInstanceListBuilder.php
@@ -67,7 +67,7 @@ class EventInstanceListBuilder extends EntityListBuilder {
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('date.formatter'),
       $container->get('language_manager'),
       $container->get('config.factory')
diff --git a/src/EventSeriesListBuilder.php b/src/EventSeriesListBuilder.php
index 38ed5f3bf5b0d3d0a8719ba83ccdf7d428bb54ea..fc59888fdf60f7f3c1e8f3b5c176dd506aa80048 100644
--- a/src/EventSeriesListBuilder.php
+++ b/src/EventSeriesListBuilder.php
@@ -67,7 +67,7 @@ class EventSeriesListBuilder extends EntityListBuilder {
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('date.formatter'),
       $container->get('language_manager'),
       $container->get('config.factory')
diff --git a/src/Form/EventInstanceRevisionDeleteForm.php b/src/Form/EventInstanceRevisionDeleteForm.php
index 4fcb048f4175b068886b1725675b8ca3c7f9394c..4fd1d6b3ed3ce9bace9f5900c3d00d304dfcefb4 100644
--- a/src/Form/EventInstanceRevisionDeleteForm.php
+++ b/src/Form/EventInstanceRevisionDeleteForm.php
@@ -79,9 +79,8 @@ class EventInstanceRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
     return new static(
-      $entity_manager->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('database'),
       $container->get('date.formatter'),
       $container->get('messenger')
diff --git a/src/Form/EventInstanceRevisionRevertForm.php b/src/Form/EventInstanceRevisionRevertForm.php
index 53a65df94b3bff1f26986a9a56d8022c1983e887..4256b3075b46510c18abf2e647b86758c8f24fd0 100644
--- a/src/Form/EventInstanceRevisionRevertForm.php
+++ b/src/Form/EventInstanceRevisionRevertForm.php
@@ -70,7 +70,7 @@ class EventInstanceRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('date.formatter'),
       $container->get('messenger')
     );
diff --git a/src/Form/EventInstanceRevisionRevertTranslationForm.php b/src/Form/EventInstanceRevisionRevertTranslationForm.php
index 10f02f6e37af89d86f866867609df1bd3f622d8f..63b9e26552e5591fd864d42488567a6d8a61acad 100644
--- a/src/Form/EventInstanceRevisionRevertTranslationForm.php
+++ b/src/Form/EventInstanceRevisionRevertTranslationForm.php
@@ -53,7 +53,7 @@ class EventInstanceRevisionRevertTranslationForm extends EventInstanceRevisionRe
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventinstance'),
+      $container->get('entity_type.manager')->getStorage('eventinstance'),
       $container->get('date.formatter'),
       $container->get('language_manager')
     );
diff --git a/src/Form/EventSeriesRevisionDeleteForm.php b/src/Form/EventSeriesRevisionDeleteForm.php
index ed515e5380495707f7306d29cced86d556d7bd96..666ef40e6c00621e77a4bb8597c0d64d4f16fac7 100644
--- a/src/Form/EventSeriesRevisionDeleteForm.php
+++ b/src/Form/EventSeriesRevisionDeleteForm.php
@@ -79,9 +79,8 @@ class EventSeriesRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
     return new static(
-      $entity_manager->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('database'),
       $container->get('date.formatter'),
       $container->get('messenger')
diff --git a/src/Form/EventSeriesRevisionRevertForm.php b/src/Form/EventSeriesRevisionRevertForm.php
index 5c2412c58ff12ff092d438bb0f010fa16e7db496..ca6dd1f5435495c1ba932d44d15db8736a573066 100644
--- a/src/Form/EventSeriesRevisionRevertForm.php
+++ b/src/Form/EventSeriesRevisionRevertForm.php
@@ -70,7 +70,7 @@ class EventSeriesRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('date.formatter'),
       $container->get('messenger')
     );
diff --git a/src/Form/EventSeriesRevisionRevertTranslationForm.php b/src/Form/EventSeriesRevisionRevertTranslationForm.php
index 448b3c681de8bc7573ead0331e5454200bf56fb7..e784638b0a9e9126f39b6aaaf8b7207cf39cc3d1 100644
--- a/src/Form/EventSeriesRevisionRevertTranslationForm.php
+++ b/src/Form/EventSeriesRevisionRevertTranslationForm.php
@@ -61,7 +61,7 @@ class EventSeriesRevisionRevertTranslationForm extends EventSeriesRevisionRevert
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getStorage('eventseries'),
+      $container->get('entity_type.manager')->getStorage('eventseries'),
       $container->get('date.formatter'),
       $container->get('language_manager'),
       $container->get('datetime.time')