diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 2ee72347d74b..5badc576afae 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -553,20 +553,20 @@ class CompanySettings extends BaseSettings
                 '$company.country',
             ],
             'invoice_details' => [
-                '$invoice.invoice_number',
+                '$invoice.number',
                 '$invoice.po_number',
-                '$invoice.invoice_date',
+                '$invoice.date',
                 '$invoice.due_date',
                 '$invoice.balance_due',
-                '$invoice.invoice_total',
+                '$invoice.total',
             ],
             'quote_details' => [
-                '$quote.quote_number',
+                '$quote.number',
                 '$quote.po_number',
-                '$quote.quote_date',
+                '$quote.date',
                 '$quote.valid_until',
                 '$quote.balance_due',
-                '$quote.quote_total',
+                '$quote.total',
             ],
             'credit_details' => [
                 '$credit.credit_number',