diff --git a/lib/open_food_network/orders_and_fulfillments_report.rb b/lib/open_food_network/orders_and_fulfillments_report.rb
index 824b484e78..c9044d148a 100644
--- a/lib/open_food_network/orders_and_fulfillments_report.rb
+++ b/lib/open_food_network/orders_and_fulfillments_report.rb
@@ -104,10 +104,10 @@ module OpenFoodNetwork
         [ { group_by: proc { |line_item| line_item.order.distributor },
           sort_by: proc { |distributor| distributor.name } },
           { group_by: proc { |line_item| line_item.order },
-          sort_by: proc { |order| order.bill_address.lastname + " " + order.bill_address.firstname },
+          sort_by: proc { |order| order.bill_address.full_name_reverse },
           summary_columns: [
             proc { |line_items| line_items.first.order.distributor.name },
-            proc { |line_items| line_items.first.order.bill_address.firstname + " " + line_items.first.order.bill_address.lastname },
+            proc { |line_items| line_items.first.order.bill_address.full_name },
             proc { |line_items| "" },
             proc { |line_items| "" },
             proc { |line_items| "" },