diff --git a/commerce_vipps.services.yml b/commerce_vipps.services.yml
index 56b62b9..5d754ee 100644
--- a/commerce_vipps.services.yml
+++ b/commerce_vipps.services.yml
@@ -28,7 +28,7 @@ services:
       - { name: event_subscriber }
   commerce_vipps.commerce_shipping_subscriber:
     class: Drupal\commerce_vipps\EventSubscriber\CommerceShippingSubscriber
-    arguments: ['@entity_type.manager', '@commerce_shipping.packer_manager', '@commerce_shipping.shipment_order_processor']
+    arguments: ['@entity_type.manager', '@commerce_shipping.packer_manager', '@commerce_shipping.early_order_processor']
     abstract: true
     tags:
       - { name: event_subscriber }
diff --git a/src/EventSubscriber/CommerceShippingSubscriber.php b/src/EventSubscriber/CommerceShippingSubscriber.php
index 65eaffb..bc19e75 100644
--- a/src/EventSubscriber/CommerceShippingSubscriber.php
+++ b/src/EventSubscriber/CommerceShippingSubscriber.php
@@ -4,7 +4,7 @@ namespace Drupal\commerce_vipps\EventSubscriber;
 
 use Drupal\commerce_price\Price;
 use Drupal\commerce_shipping\PackerManagerInterface;
-use Drupal\commerce_shipping\ShipmentOrderProcessor;
+use Drupal\commerce_shipping\EarlyOrderProcessor;
 use Drupal\commerce_vipps\Event\ReturnFromVippsExpressEvent;
 use Drupal\commerce_vipps\Event\VippsEvents;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -32,7 +32,7 @@ class CommerceShippingSubscriber implements EventSubscriberInterface {
   /**
    * The shipment order processor.
    *
-   * @var \Drupal\commerce_shipping\ShipmentOrderProcessor
+   * @var \Drupal\commerce_shipping\EarlyOrderProcessor
    */
   protected $shipmentOrderProcessor;
 
@@ -43,10 +43,10 @@ class CommerceShippingSubscriber implements EventSubscriberInterface {
    *   The entity type manager.
    * @param \Drupal\commerce_shipping\PackerManagerInterface $packerManager
    *   The packer manager.
-   * @param \Drupal\commerce_shipping\ShipmentOrderProcessor $shipmentOrderProcessor
+   * @param \Drupal\commerce_shipping\EarlyOrderProcessor $shipmentOrderProcessor
    *   The shipment order processor.
    */
-  public function __construct(EntityTypeManagerInterface $entityTypeManager, PackerManagerInterface $packerManager, ShipmentOrderProcessor $shipmentOrderProcessor) {
+  public function __construct(EntityTypeManagerInterface $entityTypeManager, PackerManagerInterface $packerManager, EarlyOrderProcessor $shipmentOrderProcessor) {
     $this->entityTypeManager = $entityTypeManager;
     $this->packerManager = $packerManager;
     $this->shipmentOrderProcessor = $shipmentOrderProcessor;