diff --git a/src/Event/CommerceStripeIdealEvent.php b/src/Event/CommerceStripeIdealEvent.php
index 61b7a61..0919481 100644
--- a/src/Event/CommerceStripeIdealEvent.php
+++ b/src/Event/CommerceStripeIdealEvent.php
@@ -10,7 +10,7 @@ use Symfony\Component\EventDispatcher\Event;
  *
  * @see \Drupal\commerce_stripe_ideal\Event\CommerceStripeIdealEvents
  */
-class CommerceStripeIdealEvent extends Event {
+class CommerceStripeIdealEvent extends \Symfony\Contracts\EventDispatcher\Event {
 
   /**
    * The order.
diff --git a/src/Plugin/Commerce/PaymentGateway/StripeIdeal.php b/src/Plugin/Commerce/PaymentGateway/StripeIdeal.php
index ade8516..9e9cf39 100644
--- a/src/Plugin/Commerce/PaymentGateway/StripeIdeal.php
+++ b/src/Plugin/Commerce/PaymentGateway/StripeIdeal.php
@@ -385,7 +385,7 @@ class StripeIdeal extends OffsitePaymentGatewayBase implements SupportsRefundsIn
       'query' => $parameters,
       'absolute' => TRUE,
     ])->toString();
-    return RedirectResponse::create($url);
+    return new \Symfony\Component\HttpFoundation\RedirectResponse($url);
   }
 
   /**
@@ -473,7 +473,7 @@ class StripeIdeal extends OffsitePaymentGatewayBase implements SupportsRefundsIn
       $payment->save();
 
       $event = new CommerceStripeIdealEvent($payment);
-      $this->eventDispatcher->dispatch(CommerceStripeIdealEvents::COMMERCE_STRIPE_IDEAL_PAYMENT_SUCCEEDED, $event);
+      $this->eventDispatcher->dispatch($event, CommerceStripeIdealEvents::COMMERCE_STRIPE_IDEAL_PAYMENT_SUCCEEDED);
     }
     return $payment;
   }
@@ -497,7 +497,7 @@ class StripeIdeal extends OffsitePaymentGatewayBase implements SupportsRefundsIn
       $payment->getState()->applyTransition($transition);
       $payment->save();
       $event = new CommerceStripeIdealEvent($payment);
-      $this->eventDispatcher->dispatch(CommerceStripeIdealEvents::COMMERCE_STRIPE_IDEAL_PAYMENT_FAILED, $event);
+      $this->eventDispatcher->dispatch($event, CommerceStripeIdealEvents::COMMERCE_STRIPE_IDEAL_PAYMENT_FAILED);
     }
     return $payment;
   }