diff --git a/Classes/EventListener/Order/Create/Order.php b/Classes/EventListener/Order/Create/Order.php
index 441bbde7..ef6549c4 100644
--- a/Classes/EventListener/Order/Create/Order.php
+++ b/Classes/EventListener/Order/Create/Order.php
@@ -11,7 +11,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Extcode\Cart\Event\Order\CreateEvent;
+use Extcode\Cart\Event\Order\EventInterface;
 use Extcode\Cart\Event\Order\PersistOrderEvent;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
@@ -23,7 +23,7 @@ public function __construct(
         private readonly PersistenceManager $persistenceManager
     ) {}
 
-    public function __invoke(CreateEvent $event): void
+    public function __invoke(EventInterface $event): void
     {
         $settings = $event->getSettings();
         $cart = $event->getCart();
diff --git a/Classes/EventListener/Order/Finish/ClearCart.php b/Classes/EventListener/Order/Finish/ClearCart.php
index ac52cccb..88fbd26b 100644
--- a/Classes/EventListener/Order/Finish/ClearCart.php
+++ b/Classes/EventListener/Order/Finish/ClearCart.php
@@ -13,7 +13,7 @@
 
 use Extcode\Cart\Domain\Model\Order\BillingAddress;
 use Extcode\Cart\Domain\Model\Order\ShippingAddress;
-use Extcode\Cart\Event\Order\FinishEvent;
+use Extcode\Cart\Event\Order\EventInterface;
 use Extcode\Cart\Service\PaymentMethodsServiceInterface;
 use Extcode\Cart\Service\SessionHandler;
 use Extcode\Cart\Utility\CartUtility;
@@ -27,7 +27,7 @@ public function __construct(
         protected readonly SessionHandler $sessionHandler
     ) {}
 
-    public function __invoke(FinishEvent $event): void
+    public function __invoke(EventInterface $event): void
     {
         $cart = $event->getCart();
         $settings = $event->getSettings();
diff --git a/Classes/EventListener/Order/Finish/Email.php b/Classes/EventListener/Order/Finish/Email.php
index 27768470..e77d1077 100644
--- a/Classes/EventListener/Order/Finish/Email.php
+++ b/Classes/EventListener/Order/Finish/Email.php
@@ -12,7 +12,7 @@
  */
 use Extcode\Cart\Domain\Model\Cart\Cart;
 use Extcode\Cart\Domain\Model\Order\Item;
-use Extcode\Cart\Event\Order\FinishEvent;
+use Extcode\Cart\Event\Order\EventInterface;
 use Extcode\Cart\Service\MailHandler;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -20,7 +20,7 @@ class Email
 {
     protected Cart $cart;
 
-    public function __invoke(FinishEvent $event): void
+    public function __invoke(EventInterface $event): void
     {
         $this->cart = $event->getCart();
         $orderItem = $event->getOrderItem();