diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 68370c9c22..a0b780408c 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -61,12 +61,12 @@ InvenTree | {{ order }}
 
 <hr>
 
-<div class='btn-group' style='float: right;'>
+<div id='order-toolbar-buttons' class='btn-group' style='float: right;'>
     <button type='button' class='btn btn-primary' id='edit-order'>Edit Order</button>
     {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
     <button type='button' class='btn btn-primary' id='place-order'>Place Order</button>
     {% elif order.status == OrderStatus.PLACED %}
-    <button type='button' class='btn btn-primary' id='receive-order'>Receive Order</button>
+    <button type='button' class='btn btn-primary' id='receive-order'>Receive Items</button>
     {% endif %}
     <button type='button' class='btn btn-primary' id='export-order' title='Export order to file'>Export</button>
 </div>
@@ -77,7 +77,7 @@ InvenTree | {{ order }}
 <button type='button' class='btn btn-default' id='new-po-line'>Add Line Item</button>
 {% endif %}
 
-<table class='table table-striped table-condensed' id='po-lines-table'>
+<table class='table table-striped table-condensed' id='po-lines-table' data-toolbar='#order-toolbar-buttons'>
     <thead>
     <tr>
         <th data-sortable='true'>Line</th>
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index b5b9540fed..ae27a0bcc4 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -158,7 +158,11 @@ class PurchaseOrderExport(AjaxView):
 
         export_format = request.GET.get('format', 'csv')
 
-        filename = str(order) + '.' + export_format
+        filename = '{order} - {company}.{fmt}'.format(
+            order=str(order),
+            company=order.supplier.name,
+            fmt=export_format
+        )
 
         filedata = order.export_to_file(format=export_format)