diff --git a/bundle/language_en.properties b/bundle/language_en.properties
index bacbd40e3c..0163092ee7 100644
--- a/bundle/language_en.properties
+++ b/bundle/language_en.properties
@@ -749,8 +749,8 @@ angal.inventory.status.done.txt
 angal.inventory.status.validated.txt                                                                   = Validated
 angal.inventory.specificproduct.txt                                                                    = Specific product
 angal.inventoryrow.theoreticqty.col                                                                    = Theoretic Qty
-angal.inventory.totalprice                                                                             = Total price
-angal.inventoryrow.unitprice.col                                                                       = Unit price
+angal.inventoryrow.totalcost.col                                                                       = Total cost
+angal.inventoryrow.unitcost.col                                                                        = Unit cost
 angal.inventory.pleasevalidateinventoryagainsbeforeconfirmation.msg                                    = Please validate this inventory again before confirmation.
 angal.invetory.tablehasbeenupdated.msg                                                                 = Table has been updated.
 angal.inventory.update.error.msg                                                                       = Inventory not updated.
diff --git a/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java b/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
index 8a062f444c..a636b583ac 100644
--- a/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
+++ b/src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java
@@ -200,12 +200,12 @@ private void fireInventoryUpdated() {
 			MessageBundle.getMessage("angal.medicalstock.duedate.col").toUpperCase(),
 			MessageBundle.getMessage("angal.inventoryrow.theoreticqty.col").toUpperCase(),
 			MessageBundle.getMessage("angal.inventoryrow.realqty.col").toUpperCase(),
-			MessageBundle.getMessage("angal.inventoryrow.unitprice.col").toUpperCase(),
-			MessageBundle.getMessage("angal.inventory.totalprice").toUpperCase() };
+			MessageBundle.getMessage("angal.inventoryrow.unitcost.col").toUpperCase(),
+			MessageBundle.getMessage("angal.inventoryrow.totalcost.col").toUpperCase() };
 	private int[] pColumwidth = { 50, 50, 200, 100, 100, 100, 100, 80, 80, 80 };
 	private boolean[] columnEditable = { false, false, false, false, false, false, false, true, false, false };
 	private boolean[] columnEditableView = { false, false, false, false, false, false, false, false, false, false };
-	private boolean[] pColumnVisible = { false, true, true, true, !GeneralData.AUTOMATICLOT_IN, true, true, true, GeneralData.LOTWITHCOST,
+	private boolean[] columnVisible = { false, true, true, true, !GeneralData.AUTOMATICLOT_IN, true, true, true, GeneralData.LOTWITHCOST,
 			GeneralData.LOTWITHCOST };
 	private boolean[] columnCentered = { false, false, false, true, true, true, true, true, true, true };
 	private boolean[] columnDecimalNumber = { false, false, false, false, false, false, false, false, true, true };
@@ -1126,9 +1126,9 @@ private JTable getJTableInventoryRow() throws OHServiceException {
 			model = new InventoryRowModel();
 			jTableInventoryRow.setModel(model);
 			jTableInventoryRow.setAutoCreateColumnsFromModel(false);
-			for (int i = 0; i < pColumnVisible.length; i++) {
+			for (int i = 0; i < columnVisible.length; i++) {
 				jTableInventoryRow.getColumnModel().getColumn(i).setPreferredWidth(pColumwidth[i]);
-				if (!pColumnVisible[i]) {
+				if (!columnVisible[i]) {
 					jTableInventoryRow.getColumnModel().getColumn(i).setMinWidth(0);
 					jTableInventoryRow.getColumnModel().getColumn(i).setMaxWidth(0);
 					jTableInventoryRow.getColumnModel().getColumn(i).setPreferredWidth(0);