diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index 408e6e5c81..bfdb4fd2ff 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -37,7 +37,7 @@ module Spree
 
             redirect_to admin_order_payments_path(@order)
           else
-            AdvanceOrderService.new(@order).call!
+            OrderWorkflow.new(@order).complete!
 
             flash[:success] = Spree.t(:new_order_completed)
             redirect_to edit_admin_order_url(@order)
diff --git a/lib/tasks/sample_data/order_factory.rb b/lib/tasks/sample_data/order_factory.rb
index 29d4cf03c6..9614f685a0 100644
--- a/lib/tasks/sample_data/order_factory.rb
+++ b/lib/tasks/sample_data/order_factory.rb
@@ -45,7 +45,7 @@ class OrderFactory
 
   def create_complete_order
     order = create_cart_order
-    AdvanceOrderService.new(order).call
+    OrderWorkflow.new(order).complete
     order
   end
 
diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb
index 0bc63e3cb8..8d74a8d901 100644
--- a/spec/controllers/admin/proxy_orders_controller_spec.rb
+++ b/spec/controllers/admin/proxy_orders_controller_spec.rb
@@ -77,7 +77,7 @@ describe Admin::ProxyOrdersController, type: :controller do
     before do
       # Processing order to completion
       allow(Spree::OrderMailer).to receive(:cancel_email) { double(:email, deliver: true) }
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
       proxy_order.reload
       proxy_order.cancel
       allow(controller).to receive(:spree_current_user) { user }
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index 603da10a10..96f718efd1 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -19,7 +19,7 @@ describe SubscriptionConfirmJob do
     let(:proxy_orders) { job.send(:unconfirmed_proxy_orders) }
 
     before do
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
     end
 
     it "returns proxy orders that meet all of the criteria" do
@@ -126,7 +126,7 @@ describe SubscriptionConfirmJob do
     let(:order) { proxy_order.initialise_order! }
 
     before do
-      AdvanceOrderService.new(order).call!
+      OrderWorkflow.new(order).complete!
       allow(job).to receive(:send_confirmation_email).and_call_original
       setup_email
       expect(job).to receive(:record_order)
diff --git a/spec/services/order_factory_spec.rb b/spec/services/order_factory_spec.rb
index c67cbaaf0e..394de7eaeb 100644
--- a/spec/services/order_factory_spec.rb
+++ b/spec/services/order_factory_spec.rb
@@ -47,7 +47,7 @@ describe OrderFactory do
     end
 
     it "retains address, delivery, and payment attributes until completion of the order" do
-      AdvanceOrderService.new(order).call
+      OrderWorkflow.new(order).complete
 
       order.reload
 
diff --git a/spec/services/order_syncer_spec.rb b/spec/services/order_syncer_spec.rb
index 9990425f6a..2cd6010736 100644
--- a/spec/services/order_syncer_spec.rb
+++ b/spec/services/order_syncer_spec.rb
@@ -409,7 +409,7 @@ describe OrderSyncer do
 
       context "when order is complete" do
         it "does not update the line_item quantities and adds the order to order_update_issues with insufficient stock" do
-          AdvanceOrderService.new(order).call
+          OrderWorkflow.new(order).complete
 
           expect(syncer.sync!).to be true
 
@@ -423,7 +423,7 @@ describe OrderSyncer do
         it "does not update the line_item quantities and adds the order to order_update_issues with out of stock" do
           # this single item available is used when the order is completed below, making the item out of stock
           variant.update_attribute(:on_hand, 1)
-          AdvanceOrderService.new(order).call
+          OrderWorkflow.new(order).complete
 
           expect(syncer.sync!).to be true
 
@@ -507,7 +507,7 @@ describe OrderSyncer do
       end
 
       context "when order is complete" do
-        before { AdvanceOrderService.new(order).call }
+        before { OrderWorkflow.new(order).complete }
 
         it "does not add line_item and adds the order to order_update_issues" do
           expect(syncer.sync!).to be true