only in patch2:
unchanged:
--- a/modules/webform_node/src/Controller/WebformNodeReferencesListController.php
+++ b/modules/webform_node/src/Controller/WebformNodeReferencesListController.php
@@ -150,12 +150,12 @@ class WebformNodeReferencesListController extends EntityListBuilder implements C
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')->getDefinition('node'),
-      $container->get('entity.manager')->getStorage('node'),
+      $container->get('entity_type.manager')->getDefinition('node'),
+      $container->get('entity_type.manager')->getStorage('node'),
       $container->get('date.formatter'),
-      $container->get('entity.manager')->getStorage('node_type'),
-      $container->get('entity.manager')->getStorage('field_config'),
-      $container->get('entity.manager')->getStorage('webform_submission'),
+      $container->get('entity_type.manager')->getStorage('node_type'),
+      $container->get('entity_type.manager')->getStorage('field_config'),
+      $container->get('entity_type.manager')->getStorage('webform_submission'),
       $container->get('webform.entity_reference_manager')
     );
   }
only in patch2:
unchanged:
--- a/src/Form/WebformSubmissionDeleteForm.php
+++ b/src/Form/WebformSubmissionDeleteForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\webform\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\webform\WebformRequestInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -45,13 +45,13 @@ class WebformSubmissionDeleteForm extends ContentEntityDeleteForm {
   /**
    * Constructs a WebformSubmissionDeleteForm object.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository.
    * @param \Drupal\webform\WebformRequestInterface $request_handler
    *   The webform request handler.
    */
-  public function __construct(EntityManagerInterface $entity_manager, WebformRequestInterface $request_handler) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityRepositoryInterface $entity_repository, WebformRequestInterface $request_handler) {
+    parent::__construct($entity_repository);
     $this->requestHandler = $request_handler;
   }
 
@@ -60,7 +60,7 @@ class WebformSubmissionDeleteForm extends ContentEntityDeleteForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
+      $container->get('entity.repository'),
       $container->get('webform.request')
     );
   }
only in patch2:
unchanged:
--- a/src/WebformEntityListBuilder.php
+++ b/src/WebformEntityListBuilder.php
@@ -84,7 +84,7 @@ class WebformEntityListBuilder extends ConfigEntityListBuilder {
   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('request_stack'),
       $container->get('current_user'),
       $container->get('entity_type.manager')
only in patch2:
unchanged:
--- a/src/WebformSubmissionListBuilder.php
+++ b/src/WebformSubmissionListBuilder.php
@@ -253,8 +253,8 @@ class WebformSubmissionListBuilder 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.manager'),
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
+      $container->get('entity_type.manager'),
       $container->get('current_route_match'),
       $container->get('request_stack'),
       $container->get('current_user'),