diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index c73f4453f0..5380a273d4 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -721,7 +721,8 @@ module Spree
         enterprise: distributor,
         email: email_for_customer,
         user: user,
-        name: bill_address&.full_name,
+        first_name: bill_address&.first_name,
+        last_name: bill_address&.last_name,
         bill_address: bill_address&.clone,
         ship_address: ship_address&.clone
       )