diff --git a/agent/modals/recurring_expense/recurring_expense_add.php b/agent/modals/recurring_expense/recurring_expense_add.php
index 5f258faf..cbed9f49 100644
--- a/agent/modals/recurring_expense/recurring_expense_add.php
+++ b/agent/modals/recurring_expense/recurring_expense_add.php
@@ -200,7 +200,7 @@ ob_start();
             </div>
 
             <?php if ($client_id) { ?>
-                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
             <?php } else { ?>
 
                 <div class="form-group col-md">
@@ -209,7 +209,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="client" required>
+                        <select class="form-control select2" name="client_id" required>
                             <option value="0">- Client (Optional) -</option>
                             <?php
 
diff --git a/agent/modals/recurring_invoice/recurring_invoice_add.php b/agent/modals/recurring_invoice/recurring_invoice_add.php
index d31dc068..21a94cc8 100644
--- a/agent/modals/recurring_invoice/recurring_invoice_add.php
+++ b/agent/modals/recurring_invoice/recurring_invoice_add.php
@@ -29,7 +29,7 @@ ob_start();
         </div>
 
         <?php if ($client_id) { ?>
-            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <?php } else { ?>
 
             <div class="form-group">
@@ -38,7 +38,7 @@ ob_start();
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
-                    <select class="form-control select2" name="client" required>
+                    <select class="form-control select2" name="client_id" required>
                         <option value="">- Client -</option>
                         <?php
                         //select unarchived clients
diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php
index a8c90793..0d1f3395 100644
--- a/agent/modals/ticket/ticket_add.php
+++ b/agent/modals/ticket/ticket_add.php
@@ -20,7 +20,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
 
     <?php if (isset($_GET['project_id'])) { ?>
-    <input type="hidden" name="project" value="<?php echo intval($_GET['project_id']); ?>">
+    <input type="hidden" name="project_id" value="<?php echo intval($_GET['project_id']); ?>">
     <?php } ?>
 
     <div class="modal-body">
@@ -47,7 +47,7 @@ ob_start();
             <div class="tab-pane fade show active" id="pills-ticket-details">
 
                 <?php if ($client_id) { ?>
-                    <input type="hidden" name="client" value="<?= $client_id ?>">
+                    <input type="hidden" name="client_id" value="<?= $client_id ?>">
                 <?php } else { ?>
 
                     <div class="form-group">
@@ -56,7 +56,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
-                            <select class="form-control select2" name="client" required>
+                            <select class="form-control select2" name="client_id" required>
                                 <option value="">- Client -</option>
                                 <?php
 
@@ -157,7 +157,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                                 </div>
-                                <select class="form-control select2" name="category">
+                                <select class="form-control select2" name="category_id">
                                     <option value="0">- Not Categorized -</option>
                                     <?php
                                     $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -235,11 +235,11 @@ ob_start();
 
             </div>
 
-            <?php if($client_id) { ?>
+            <?php if ($client_id) { ?>
 
                 <div class="tab-pane fade" id="pills-ticket-contacts">
 
-                    <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
                     <div class="form-group">
                         <label>Contact</label>
@@ -321,7 +321,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
                             </div>
-                            <select class="form-control select2" name="asset">
+                            <select class="form-control select2" name="asset_id">
                                 <option value="0">- None -</option>
                                 <?php
 
@@ -371,7 +371,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                             </div>
-                            <select class="form-control select2" name="location">
+                            <select class="form-control select2" name="location_id">
                                 <option value="0">- None -</option>
                                 <?php
 
@@ -397,7 +397,7 @@ ob_start();
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="vendor">
+                                    <select class="form-control select2" name="vendor_id">
                                         <option value="0">- None -</option>
                                         <?php
 
@@ -436,7 +436,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
                             </div>
-                            <select class="form-control select2" name="project">
+                            <select class="form-control select2" name="project_id">
                                 <option value="0">- Select Project -</option>
                                 <?php
 
diff --git a/agent/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php
index a48d7530..63cc2c82 100644
--- a/agent/modals/ticket/ticket_add_v2.php
+++ b/agent/modals/ticket/ticket_add_v2.php
@@ -19,10 +19,10 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <!-- Hidden/System fields -->
     <?php if ($client_id) { ?>
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
     <?php } ?>
     <?php if ($project_id) { ?>
-        <input type="hidden" name="project" value="<?php echo $project_id; ?>">
+        <input type="hidden" name="project_id" value="<?php echo $project_id; ?>">
     <?php } ?>
     <input type="hidden" name="billable" value="0">
 
@@ -128,7 +128,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                                 </div>
-                                <select class="form-control select2" name="category">
+                                <select class="form-control select2" name="category_id">
                                     <option value="0">- Not Categorized -</option>
                                     <?php
                                     $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -189,7 +189,7 @@ ob_start();
 
             <!-- Ticket client/contact -->
             <?php if ($contact_id) { ?>
-                <input type="hidden" name="contact" value="<?php echo $contact_id; ?>">
+                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
             <?php } else { ?>
                 <div class="tab-pane fade" id="pills-add-contacts">
 
@@ -199,7 +199,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
-                            <select class="form-control select2" name="client" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
+                            <select class="form-control select2" name="client_id" id="changeClientSelect" required <?php if ($client_id) { echo "disabled"; } ?>>
                                 <option value="">- Client -</option>
                                 <?php
 
@@ -221,7 +221,7 @@ ob_start();
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                             </div>
-                            <select class="form-control select2" name="contact" id="contactSelect">
+                            <select class="form-control select2" name="contact_id" id="contactSelect">
                             </select>
                         </div>
                     </div>
@@ -238,7 +238,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
                         </div>
-                        <select class="form-control select2" name="asset" id="assetSelect">
+                        <select class="form-control select2" name="asset_id" id="assetSelect">
                         </select>
                     </div>
                 </div>
@@ -249,7 +249,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                         </div>
-                        <select class="form-control select2" name="location" id="locationSelect">
+                        <select class="form-control select2" name="location_id" id="locationSelect">
                         </select>
                     </div>
                 </div>
@@ -263,7 +263,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                                 </div>
-                                <select class="form-control select2" name="vendor" id="vendorSelect">
+                                <select class="form-control select2" name="vendor_id" id="vendorSelect">
                                 </select>
                             </div>
                         </div>
diff --git a/agent/modals/ticket/ticket_edit.php b/agent/modals/ticket/ticket_edit.php
index 02c4a592..50f71edf 100644
--- a/agent/modals/ticket/ticket_edit.php
+++ b/agent/modals/ticket/ticket_edit.php
@@ -113,7 +113,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                                 </div>
-                                <select class="form-control select2" name="category">
+                                <select class="form-control select2" name="category_id">
                                     <option value="0">- Uncategorized -</option>
                                     <?php
                                     $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -201,7 +201,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
-                        <select class="form-control select2" name="contact">
+                        <select class="form-control select2" name="contact_id">
                             <option value="0">No One</option>
                             <?php
                             $sql_client_contacts_select = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_primary, contact_technical FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_primary DESC, contact_technical DESC, contact_name ASC");
@@ -255,7 +255,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
                         </div>
-                        <select class="form-control select2" name="asset">
+                        <select class="form-control select2" name="asset_id">
                             <option value="0">- None -</option>
                             <?php
 
@@ -305,7 +305,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                         </div>
-                        <select class="form-control select2" name="location">
+                        <select class="form-control select2" name="location_id">
                             <option value="0">- None -</option>
                             <?php
 
@@ -333,7 +333,7 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                                 </div>
-                                <select class="form-control select2" name="vendor">
+                                <select class="form-control select2" name="vendor_id">
                                     <option value="0">- None -</option>
                                     <?php
 
@@ -375,7 +375,7 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
                         </div>
-                        <select class="form-control select2" name="project">
+                        <select class="form-control select2" name="project_id">
                             <option value="0">- None -</option>
                             <?php
 
diff --git a/agent/post/recurring_expense.php b/agent/post/recurring_expense.php
index 5a7cc545..c724a9b5 100644
--- a/agent/post/recurring_expense.php
+++ b/agent/post/recurring_expense.php
@@ -18,7 +18,7 @@ if (isset($_POST['create_recurring_expense'])) {
     $amount =  floatval(str_replace(',', '', $_POST['amount']));
     $account = intval($_POST['account']);
     $vendor = intval($_POST['vendor']);
-    $client_id = intval($_POST['client']);
+    $client_id = intval($_POST['client_id']);
     $category = intval($_POST['category']);
     $description = sanitizeInput($_POST['description']);
     $reference = sanitizeInput($_POST['reference']);
@@ -54,7 +54,7 @@ if (isset($_POST['edit_recurring_expense'])) {
     $amount =  floatval(str_replace(',', '', $_POST['amount']));
     $account = intval($_POST['account']);
     $vendor = intval($_POST['vendor']);
-    $client_id = intval($_POST['client']);
+    $client_id = intval($_POST['client_id']);
     $category = intval($_POST['category']);
     $description = sanitizeInput($_POST['description']);
     $reference = sanitizeInput($_POST['reference']);
diff --git a/agent/post/recurring_invoice.php b/agent/post/recurring_invoice.php
index 3b45b134..5ff66e39 100644
--- a/agent/post/recurring_invoice.php
+++ b/agent/post/recurring_invoice.php
@@ -76,7 +76,7 @@ if (isset($_POST['add_recurring_invoice'])) {
 
     enforceUserPermission('module_sales', 2);
 
-    $client_id = intval($_POST['client']);
+    $client_id = intval($_POST['client_id']);
     $frequency = sanitizeInput($_POST['frequency']);
     $start_date = sanitizeInput($_POST['start_date']);
     $category = intval($_POST['category']);
diff --git a/agent/post/ticket.php b/agent/post/ticket.php
index 22c7b834..a757d2a6 100644
--- a/agent/post/ticket.php
+++ b/agent/post/ticket.php
@@ -12,23 +12,23 @@ if (isset($_POST['add_ticket'])) {
 
     enforceUserPermission('module_support', 2);
 
-    $client_id = intval($_POST['client']);
+    $client_id = intval($_POST['client_id']);
     $assigned_to = intval($_POST['assigned_to']);
     if ($assigned_to == 0) {
         $ticket_status = 1;
     } else {
         $ticket_status = 2;
     }
-    $contact = intval($_POST['contact']);
-    $category_id = intval($_POST['category']);
+    $contact_id = intval($_POST['contact_id']);
+    $category_id = intval($_POST['category_id']);
     $subject = sanitizeInput($_POST['subject']);
     $priority = sanitizeInput($_POST['priority']);
     $details = mysqli_real_escape_string($mysqli, $_POST['details']);
     $vendor_ticket_number = sanitizeInput($_POST['vendor_ticket_number']);
-    $vendor_id = intval($_POST['vendor']);
-    $asset_id = intval($_POST['asset']);
-    $location_id = intval($_POST['location']);
-    $project_id = intval($_POST['project']);
+    $vendor_id = intval($_POST['vendor_id']);
+    $asset_id = intval($_POST['asset_id']);
+    $location_id = intval($_POST['location_id']);
+    $project_id = intval($_POST['project_id']);
     $use_primary_contact = intval($_POST['use_primary_contact'] ?? 0);
     $ticket_template_id = intval($_POST['ticket_template_id']);
     $billable = intval($_POST['billable'] ?? 0);
@@ -51,7 +51,7 @@ if (isset($_POST['add_ticket'])) {
     if ($use_primary_contact == 1) {
         $sql = mysqli_query($mysqli, "SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1");
         $row = mysqli_fetch_assoc($sql);
-        $contact = intval($row['contact_id']);
+        $contact_id = intval($row['contact_id']);
     }
 
     // Atomically increment and get the new ticket number
@@ -74,7 +74,7 @@ if (isset($_POST['add_ticket'])) {
     //Generate a unique URL key for clients to access
     $url_key = randomString(32);
 
-    mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Agent', ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_url_key = '$url_key', ticket_due_at = $due, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id");
+    mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_source = 'Agent', ticket_category = $category_id, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_billable = '$billable', ticket_status = '$ticket_status', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_created_by = $session_user_id, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact_id, ticket_url_key = '$url_key', ticket_due_at = $due, ticket_client_id = $client_id, ticket_invoice_id = 0, ticket_project_id = $project_id");
 
     $ticket_id = mysqli_insert_id($mysqli);
 
@@ -203,19 +203,19 @@ if (isset($_POST['edit_ticket'])) {
     enforceUserPermission('module_support', 2);
 
     $ticket_id = intval($_POST['ticket_id']);
-    $contact_id = intval($_POST['contact']);
+    $contact_id = intval($_POST['contact_id']);
     $assigned_to = intval($_POST['assigned_to']);
     $notify = intval($_POST['contact_notify'] ?? 0);
-    $category_id = intval($_POST['category']);
+    $category_id = intval($_POST['category_id']);
     $ticket_subject = sanitizeInput($_POST['subject']);
     $billable = intval($_POST['billable'] ?? 0);
     $ticket_priority = sanitizeInput($_POST['priority']);
     $details = mysqli_real_escape_string($mysqli, $_POST['details']);
     $vendor_ticket_number = sanitizeInput($_POST['vendor_ticket_number']);
-    $vendor_id = intval($_POST['vendor']);
-    $asset_id = intval($_POST['asset']);
-    $location_id = intval($_POST['location']);
-    $project_id = intval($_POST['project']);
+    $vendor_id = intval($_POST['vendor_id']);
+    $asset_id = intval($_POST['asset_id']);
+    $location_id = intval($_POST['location_id']);
+    $project_id = intval($_POST['project_id']);
     // Validate/clean due field
     $dueInput = $_POST['due'] ?? null;
     if ($dueInput === null || trim($dueInput) === '') {