diff --git a/app/models/solidus_stripe/address_from_params_service.rb b/app/models/solidus_stripe/address_from_params_service.rb
index 5c56d4a9..5e8f588a 100644
--- a/app/models/solidus_stripe/address_from_params_service.rb
+++ b/app/models/solidus_stripe/address_from_params_service.rb
@@ -12,7 +12,13 @@ def call
       if user
         user.addresses.find_or_initialize_by(attributes)
       else
-        Spree::Address.new(attributes)
+        begin
+          Spree::Address.new(attributes)
+        rescue ActiveModel::UnknownAttributeError # Handle old address format
+          name = attributes.delete!(:name)
+          attributes[:first_name], attributes[:last_name] = name.split(/[[:space:]]/, 2)
+          Spree::Address.new(attributes)
+        end
       end
     end
 
@@ -24,12 +30,11 @@ def attributes
           # possibly anonymized attributes:
           phone = address_params[:phone]
           lines = address_params[:addressLine]
-          names = address_params[:recipient].split(' ')
+          name = address_params[:recipient]
 
           attributes.merge!(
             state_id: state&.id,
-            firstname: names.first,
-            lastname: names.last,
+            name: name,
             phone: phone,
             address1: lines.first,
             address2: lines.second
diff --git a/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb b/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb
index 6f5d27ee..93b815db 100644
--- a/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb
+++ b/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb
@@ -66,7 +66,7 @@
 <%- if @order.has_checkout_step?('address') -%>
   <script>
     Spree.stripeAdditionalInfo = {
-      name: "<%= @order.bill_address.full_name %>",
+      name: "<%= @order.bill_address.try(:full_name) || @order.bill_address.name %>",
       address_line1: "<%= @order.bill_address.address1 %>",
       address_line2: "<%= @order.bill_address.address2 %>",
       address_city: "<%= @order.bill_address.city %>",
diff --git a/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb b/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb
index e7473025..42a49204 100644
--- a/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb
+++ b/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb
@@ -4,7 +4,7 @@
 
 <div class="field field-required">
   <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %>
-  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
+  <%= text_field_tag "#{param_prefix}[name]", @order.try(:billing_name) || "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
 </div>
 
 <div class="field field-required" data-hook="card_number">
diff --git a/spec/models/solidus_stripe/address_from_params_service_spec.rb b/spec/models/solidus_stripe/address_from_params_service_spec.rb
index 308c81c2..b4ce7f1d 100644
--- a/spec/models/solidus_stripe/address_from_params_service_spec.rb
+++ b/spec/models/solidus_stripe/address_from_params_service_spec.rb
@@ -37,8 +37,7 @@
           user.addresses << create(
             :address, city: params[:city],
             zipcode: params[:postalCode],
-            firstname: 'Clark',
-            lastname: 'Kent',
+            name: 'Clark Kent',
             address1: params[:addressLine].first,
             address2: nil,
             phone: '555-555-0199'
diff --git a/spec/support/solidus_address_helper.rb b/spec/support/solidus_address_helper.rb
index 9f567b6a..98f37544 100644
--- a/spec/support/solidus_address_helper.rb
+++ b/spec/support/solidus_address_helper.rb
@@ -5,11 +5,11 @@
 # previous first/last name combination.
 module SolidusAddressNameHelper
   def fill_in_name
-    if Spree::Config.preferences[:use_combined_first_and_last_name_in_address]
-      fill_in "Name", with: "Han Solo"
-    else
+    if has_field?("First Name")
       fill_in "First Name", with: "Han"
       fill_in "Last Name", with: "Solo"
+    else
+      fill_in "Name", with: "Han Solo"
     end
   end
 end