diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index c6e5cca7d187..a06a98918dd9 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -296,8 +296,8 @@ class HtmlEngine
         $data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')];
         $data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
         $data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
-        $data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
-        $data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
+        $data['$product.description'] = ['value' => '', 'label' => ctrans('texts.description')];
+        $data['$product.unit_cost'] = ['value' => '', 'label' => ctrans('texts.unit_cost')];
         $data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
         $data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
         $data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
@@ -308,7 +308,7 @@ class HtmlEngine
         $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
         $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
         $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
-        $data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
+        $data['$task.description'] = ['value' => '', 'label' => ctrans('texts.description')];
         $data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')];
         $data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')];
         $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 1b7e2e375f31..b7a3d8a1476e 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -617,14 +617,14 @@ trait MakesInvoiceValues
             }
 
             $data[$key][$table_type.'.product_key'] = $item->product_key;
-            $data[$key][$table_type.'.notes'] = $item->notes;
+            $data[$key][$table_type.'.description'] = $item->notes;
             $data[$key][$table_type.'.custom_value1'] = $item->custom_value1;
             $data[$key][$table_type.'.custom_value2'] = $item->custom_value2;
             $data[$key][$table_type.'.custom_value3'] = $item->custom_value3;
             $data[$key][$table_type.'.custom_value4'] = $item->custom_value4;
             $data[$key][$table_type.'.quantity'] = $item->quantity;
 
-            $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client);
+            $data[$key][$table_type.'.unit_cost'] = Number::formatMoney($item->cost, $this->client);
             $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client);
 
             if (isset($item->discount) && $item->discount > 0) {