diff --git a/app/models/customer.rb b/app/models/customer.rb
index 96a14d01d2..72f37c66e2 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -36,6 +36,10 @@ class Customer < ApplicationRecord
 
   private
 
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+
   def downcase_email
     email&.downcase!
   end
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index fe31ab000a..b0e9405620 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -1054,7 +1054,7 @@ describe Spree::Order do
             expect(order.customer).to be_nil
             expect { order.send(:ensure_customer) }.to change{ Customer.count }.by 1
 
-            expect(order.customer.name).to eq order.bill_address.full_name
+            expect(order.customer.full_name).to eq order.bill_address.full_name
             expect(order.customer.bill_address.same_as?(order.bill_address)).to be true
             expect(order.customer.ship_address.same_as?(order.ship_address)).to be true
           end