diff --git a/database_updates.php b/database_updates.php
index ca8598fd..d5b577a6 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -1407,19 +1407,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
     //
     if (CURRENT_DATABASE_VERSION == '0.8.8') {
     // Insert queries here required to update to DB version 0.8.9
-    mysqli_query($mysqli, "ALTER TABLE `invoice_items` ADD `item_order_id` INT(11) NOT NULL DEFAULT 0 AFTER `item_total`");
-    // Update existing invoices so that item_order_id is set to item_id
+    mysqli_query($mysqli, "ALTER TABLE `invoice_items` ADD `item_order` INT(11) NOT NULL DEFAULT 0 AFTER `item_total`");
+    // Update existing invoices so that item_order is set to item_id
     $sql_invoices = mysqli_query($mysqli, "SELECT invoice_id FROM invoices WHERE invoice_id IS NOT NULL");
     foreach ($sql_invoices as $row) {
         $invoice_id = $row['invoice_id'];
         $sql_invoice_items = mysqli_query($mysqli, "SELECT item_id FROM invoice_items WHERE item_invoice_id = '$invoice_id' ORDER BY item_id ASC");
-        $item_order_id = 1;
+        $item_order = 1;
         foreach ($sql_invoice_items as $row) {
             $item_id = $row['item_id'];
-            mysqli_query($mysqli, "UPDATE invoice_items SET item_order_id = '$item_order_id' WHERE item_id = '$item_id'");
-            $item_order_id++;
+            mysqli_query($mysqli, "UPDATE invoice_items SET item_order = '$item_order' WHERE item_id = '$item_id'");
+            $item_order++;
             //Log changes made to invoice
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Modify', log_description = 'Updated item_order_id to item_id: $item_order_id'");
+            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Invoice', log_action = 'Modify', log_description = 'Updated item_order to item_id: $item_order'");
 
         }
     }
diff --git a/db.sql b/db.sql
index c777a9dc..2ba99800 100644
--- a/db.sql
+++ b/db.sql
@@ -682,7 +682,7 @@ CREATE TABLE `invoice_items` (
   `item_subtotal` decimal(15,2) NOT NULL DEFAULT 0.00,
   `item_tax` decimal(15,2) NOT NULL DEFAULT 0.00,
   `item_total` decimal(15,2) NOT NULL DEFAULT 0.00,
-  `item_order_id` int(11) NOT NULL DEFAULT 0,
+  `item_order` int(11) NOT NULL DEFAULT 0,
   `item_created_at` datetime NOT NULL DEFAULT current_timestamp(),
   `item_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),
   `item_archived_at` datetime DEFAULT NULL,
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 6b2db470..b340c75b 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -116,7 +116,7 @@ if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status
 }
 
 // Invoice individual items
-$sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order_id ASC");
+$sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC");
 
 ?>
 
diff --git a/invoice.php b/invoice.php
index 4aa391fa..437fc32c 100644
--- a/invoice.php
+++ b/invoice.php
@@ -247,7 +247,7 @@ if (isset($_GET['invoice_id'])) {
                 </div>
             </div>
 
-            <?php $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order_id ASC"); ?>
+            <?php $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_invoice_id = $invoice_id ORDER BY item_order ASC"); ?>
 
             <div class="row mb-4">
                 <div class="col-md-12">
@@ -284,7 +284,7 @@ if (isset($_GET['invoice_id'])) {
                                     $tax_id = intval($row['item_tax_id']);
                                     $total_tax = $item_tax + $total_tax;
                                     $sub_total = $item_price * $item_quantity + $sub_total;
-                                    $item_order_id = intval($row['item_order_id']);
+                                    $item_order = intval($row['item_order']);
 
                                     ?>
 
@@ -295,7 +295,7 @@ if (isset($_GET['invoice_id'])) {
                                                 <form action="post.php" method="post">
                                                     <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
                                                     <input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
-                                                    <input type="hidden" name="item_order_id" value="<?php echo $item_order_id; ?>">
+                                                    <input type="hidden" name="item_order" value="<?php echo $item_order; ?>">
                                                     <button class="btn btn-sm btn-light" type="submit" name="update_invoice_item_order" value="up"><i class="fa fa-fw fa-arrow-up"></i></button>
                                                     <button class="btn btn-sm btn-light" type="submit" name="update_invoice_item_order" value="down"><i class="fa fa-fw fa-arrow-down"></i></button>
                                                 </form>
@@ -340,7 +340,7 @@ if (isset($_GET['invoice_id'])) {
                                 <tr class="d-print-none" <?php if ($invoice_status == "Paid" || $invoice_status == "Cancelled") { echo "hidden"; } ?>>
                                     <form action="post.php" method="post" autocomplete="off">
                                         <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
-                                        <input type="hidden" name="item_order_id" value="<?php echo mysqli_num_rows($sql_invoice_items) + 1; ?>">
+                                        <input type="hidden" name="item_order" value="<?php echo mysqli_num_rows($sql_invoice_items) + 1; ?>">
                                         <td></td>
                                         <td></td>
                                         <td>
diff --git a/post/invoice.php b/post/invoice.php
index 4c2c0574..d9596425 100644
--- a/post/invoice.php
+++ b/post/invoice.php
@@ -396,7 +396,7 @@ if (isset($_POST['add_invoice_item'])) {
     $qty = floatval($_POST['qty']);
     $price = floatval($_POST['price']);
     $tax_id = intval($_POST['tax_id']);
-    $item_order_id = intval($_POST['item_order_id']);
+    $item_order = intval($_POST['item_order']);
 
     $subtotal = $price * $qty;
 
@@ -411,7 +411,7 @@ if (isset($_POST['add_invoice_item'])) {
 
     $total = $subtotal + $tax_amount;
 
-    mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order_id = $item_order_id, item_tax_id = $tax_id, item_invoice_id = $invoice_id");
+    mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order = $item_order, item_tax_id = $tax_id, item_invoice_id = $invoice_id");
 
     //Update Invoice Balances
 
@@ -1098,7 +1098,7 @@ if (isset($_POST['update_invoice_item_order'])) {
         $new_item_order = $item_order - 1;
 
         //Check if new item order is used
-        $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $item_invoice_id AND item_order_id = $new_item_order");
+        $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_invoice_id = $item_invoice_id AND item_order = $new_item_order");
 
         //Redo the entire order of list
         while ($row = mysqli_fetch_array($sql)) {
@@ -1107,13 +1107,13 @@ if (isset($_POST['update_invoice_item_order'])) {
 
             $new_item_order = $item_order + 1;
 
-            mysqli_query($mysqli,"UPDATE invoice_items SET item_order_id = $new_item_order WHERE item_id = $item_id");
+            mysqli_query($mysqli,"UPDATE invoice_items SET item_order = $new_item_order WHERE item_id = $item_id");
         }
 
 
 
-        mysqli_query($mysqli,"UPDATE invoice_items SET item_order_id = $item_order WHERE item_invoice_id = $item_invoice_id AND item_order_id = $new_item_order");
-        mysqli_query($mysqli,"UPDATE invoice_items SET item_order_id = $new_item_order WHERE item_id = $item_id");
+        mysqli_query($mysqli,"UPDATE invoice_items SET item_order = $item_order WHERE item_invoice_id = $item_invoice_id AND item_order = $new_item_order");
+        mysqli_query($mysqli,"UPDATE invoice_items SET item_order = $new_item_order WHERE item_id = $item_id");
 
         $_SESSION['alert_message'] = "Item moved up";
 
@@ -1131,8 +1131,8 @@ if (isset($_POST['update_invoice_item_order'])) {
 
         $new_item_order = $item_order + 1;
 
-        mysqli_query($mysqli,"UPDATE invoice_items SET item_order_id = $item_order WHERE item_invoice_id = $item_invoice_id AND item_order_id = $new_item_order");
-        mysqli_query($mysqli,"UPDATE invoice_items SET item_order_id = $new_item_order WHERE item_id = $item_id");
+        mysqli_query($mysqli,"UPDATE invoice_items SET item_order = $item_order WHERE item_invoice_id = $item_invoice_id AND item_order = $new_item_order");
+        mysqli_query($mysqli,"UPDATE invoice_items SET item_order = $new_item_order WHERE item_id = $item_id");
 
         $_SESSION['alert_message'] = "Item moved down";