diff --git a/admin/ai_models.php b/admin/ai_models.php
index 1f76e8ea..cbc077a4 100644
--- a/admin/ai_models.php
+++ b/admin/ai_models.php
@@ -17,7 +17,7 @@ $num_rows = mysqli_num_rows($sql);
         <a href="/admin">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="ai_provider.php">AI Providers</a>
+        <a href="ai_providers.php">AI Providers</a>
     </li>
     <li class="breadcrumb-item active">AI Models</li>
 </ol>
diff --git a/admin/ai_providers.php b/admin/ai_providers.php
index 69001c85..f41fb236 100644
--- a/admin/ai_providers.php
+++ b/admin/ai_providers.php
@@ -68,7 +68,7 @@ $num_rows = mysqli_num_rows($sql);
                         <td><?php echo $url; ?></td>
                         <td><?php echo $key; ?></td>
                         <td class="text-center">
-                            <a class="badge badge-dark badge-pill p-2" href="ai_model.php"><?= $ai_model_count ?></a>
+                            <a class="badge badge-dark badge-pill p-2" href="ai_models.php"><?= $ai_model_count ?></a>
                         <td>
                             <div class="dropdown dropleft text-center">
                                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php
index 6920bb68..14da3fd5 100644
--- a/admin/includes/side_nav.php
+++ b/admin/includes/side_nav.php
@@ -44,41 +44,41 @@
                 <li class="nav-header">TAGS & CATEGORIES</li>
 
                 <li class="nav-item">
-                    <a href="/admin/tag.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tag.php' ? 'active' : ''); ?>">
+                    <a href="/admin/tags.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tags.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-tags"></i>
                         <p>Tags</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="/admin/category.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'category.php' ? 'active' : ''); ?>">
+                    <a href="/admin/categories.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'categories.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-list-ul"></i>
                         <p>Categories</p>
                     </a>
                 </li>
                 <?php if ($config_module_enable_accounting) { ?>
                     <li class="nav-item">
-                        <a href="/admin/tax.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax.php' ? 'active' : ''); ?>">
+                        <a href="/admin/tax_rates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'tax_rates.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-balance-scale"></i>
                             <p>Taxes</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/payment_method.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_method.php' ? 'active' : ''); ?>">
+                        <a href="/admin/payment_methods.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'payment_methods.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-hand-holding-usd"></i>
                             <p>Payment Methods</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/payment_provider.php"
-                           class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['payment_provider.php', 'saved_payment_method.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/payment_providers.php"
+                           class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['payment_providers.php', 'saved_payment_methods.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon far fa-credit-card"></i>
                             <p>Payment Providers</p>
                         </a>
                     </li>
                 <?php } ?>
                     <li class="nav-item">
-                        <a href="/admin/ai_provider.php"
-                        class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ai_provider.php', 'ai_model.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/ai_providers.php"
+                        class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ai_providers.php', 'ai_models.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-robot"></i>
                             <p>AI Providers</p>
                         </a>
@@ -86,14 +86,14 @@
 
                 <?php if ($config_module_enable_ticketing) { ?>
                     <li class="nav-item">
-                        <a href="/admin/ticket_status.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_status.php' ? 'active' : ''); ?>">
+                        <a href="/admin/ticket_statuses.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'ticket_statuses.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-info-circle"></i>
                             <p>Ticket Statuses</p>
                         </a>
                     </li>
                 <?php } ?>
                 <li class="nav-item">
-                    <a href="/admin/custom_link.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_link.php' ? 'active' : ''); ?>">
+                    <a href="/admin/custom_links.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'custom_links.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-external-link-alt"></i>
                         <p>Custom Links</p>
                     </a>
@@ -104,7 +104,7 @@
 
                     <!-- 2025-11-16 JQ - Hide Contracts not yet ready
                     <li class="nav-item">
-                        <a href="/admin/contract_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/contract_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'contract_templates.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file-contract"></i>
                             <p>
                                 <span href="#" class="fas fa-plus-circle right ajax-modal" data-modal-url="/admin/modals/contract_template/contract_template_add.php" data-modal-size="lg"></span>
@@ -114,31 +114,31 @@
                     </li>
                     -->
                     <li class="nav-item">
-                        <a href="/admin/project_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_template.php', 'project_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/project_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['project_templates.php', 'project_template.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-project-diagram"></i>
                             <p>Project Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/ticket_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_template.php', 'ticket_template_details.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/ticket_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['ticket_templates.php', 'ticket_template.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Ticket Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/vendor_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/vendor_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'vendor_templates.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-building"></i>
                             <p>Vendor Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/software_template.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_template.php' ? 'active' : ''); ?>">
+                        <a href="/admin/software_templates.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'software_templates.php' ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-rocket"></i>
                             <p>License Templates</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="/admin/document_template.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_template.php', 'document_template.php']) ? 'active' : ''); ?>">
+                        <a href="/admin/document_templates.php" class="nav-link <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['document_templates.php', 'document_template.php']) ? 'active' : ''); ?>">
                             <i class="nav-icon fas fa-file-alt"></i>
                             <p>Document Templates</p>
                         </a>
@@ -154,13 +154,13 @@
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="/admin/audit_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'audit_log.php' ? 'active' : ''); ?>">
+                    <a href="/admin/audit_logs.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'audit_logs.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>Audit Logs</p>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a href="/admin/app_log.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'app_log.php' ? 'active' : ''); ?>">
+                    <a href="/admin/app_logs.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'app_logs.php' ? 'active' : ''); ?>">
                         <i class="nav-icon fas fa-history"></i>
                         <p>App Logs</p>
                     </a>
@@ -185,7 +185,7 @@
                 </li>
 
                 <!-- SETTINGS Section -->
-                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['settings_company.php', 'settings_localization.php', 'settings_theme.php', 'settings_security.php', 'settings_mail.php', 'settings_notification.php', 'settings_default.php', 'settings_invoice.php', 'settings_quote.php', 'settings_online_payment.php', 'settings_online_payment_clients.php', 'settings_project.php', 'settings_ticket.php', 'settings_ai.php', 'identity_provider.php', 'settings_telemetry.php', 'settings_module.php']) ? 'menu-open' : ''); ?>">
+                <li class="nav-item has-treeview mt-2 <?php echo (in_array(basename($_SERVER['PHP_SELF']), ['settings_company.php', 'settings_localization.php', 'settings_theme.php', 'settings_security.php', 'settings_mail.php', 'settings_notification.php', 'settings_default.php', 'settings_invoice.php', 'settings_quote.php', 'settings_online_payment.php', 'settings_online_payment_clients.php', 'settings_project.php', 'settings_ticket.php', 'settings_ai.php', 'identity_providers.php', 'settings_telemetry.php', 'settings_module.php']) ? 'menu-open' : ''); ?>">
                     <a href="#" class="nav-link">
                         <p>
                             SETTINGS
@@ -266,7 +266,7 @@
                         <!-- Currently the only integration is the client portal SSO -->
                         <?php if ($config_client_portal_enable) { ?>
                             <li class="nav-item">
-                                <a href="/admin/identity_provider.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'identity_provider.php' ? 'active' : ''); ?>">
+                                <a href="/admin/identity_providers.php" class="nav-link <?php echo (basename($_SERVER['PHP_SELF']) == 'identity_providers.php' ? 'active' : ''); ?>">
                                     <i class="nav-icon fas fa-fingerprint"></i>
                                     <p>Identity Provider</p>
                                 </a>
diff --git a/admin/payment_providers.php b/admin/payment_providers.php
index f8cd452f..6bc2622a 100644
--- a/admin/payment_providers.php
+++ b/admin/payment_providers.php
@@ -95,7 +95,7 @@ $num_rows = mysqli_num_rows($sql);
                         <td><?php echo $category; ?></td>
                         <td><?php echo $percent_fee; ?>% + <?php echo numfmt_format_currency($currency_format, $flat_fee, $session_company_currency); ?></td>
                         <td class="text-center">
-                            <a class="badge badge-dark badge-pill p-2" href="saved_payment_method.php"><?= $saved_payment_count ?></a>
+                            <a class="badge badge-dark badge-pill p-2" href="saved_payment_methods.php"><?= $saved_payment_count ?></a>
                         </td>
                         <td>
                             <div class="dropdown dropleft text-center">
diff --git a/admin/post.php b/admin/post.php
index 86c48f7d..16bb6e6d 100644
--- a/admin/post.php
+++ b/admin/post.php
@@ -11,29 +11,21 @@ require_once "../includes/check_login.php";
 // Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them)
 define('FROM_POST_HANDLER', true);
 
-// Determine which files we should load
-
-// Parse URL & get the path
-$path = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH);
-
-// Get the base name (the page name)
-$module = explode(".", basename($path))[0];
-
-// Strip off any _details bits
-$module = str_ireplace('_details', '', $module);
-
-// Dynamically load admin-related module POST logic
+// Dynamically load admin module POST logic
+//  Every handler self-gates on its own if(isset($_POST['action'])) check,
+//  so we load them all and let the matching one fire. The page filename is
+//  irrelevant to dispatch - matches how agent/post.php works.
+//  To add a new admin POST handler, drop a file in admin/post/.
 if (isset($session_is_admin) && $session_is_admin) {
-    // As (almost) every admin setting is only changed from 1 page, we can dynamically load the relevant logic inside this single admin check IF statement
-    //  To add a new admin POST request handler, add a file named after the admin page
-    //    e.g. changes made on the page http://itflow/admin_ticket_statues.php will load the page admin/post/admin_ticket_statues.php to handle the changes
-
-    include_once "post/$module.php";
-    
+    foreach (glob("post/*.php") as $admin_module) {
+        if (!preg_match('/_model\.php$/', basename($admin_module))) {
+            require_once $admin_module;
+        }
+    }
 }
 
 // Logout is the same for user and admin
 require_once "../post/logout.php";
 
 // TODO: Find a home for these
-require_once "../post/misc.php";
+require_once "../post/misc.php";
\ No newline at end of file
diff --git a/admin/project_template.php b/admin/project_template.php
index 95932e33..5810f1ed 100644
--- a/admin/project_template.php
+++ b/admin/project_template.php
@@ -156,7 +156,7 @@ if (isset($_GET['project_template_id'])) {
                             <tr data-task-id="<?php echo $ticket_template_id; ?>">
                                 <td>
                                     <a href="#" class="drag-handle"><i class="fas fa-bars text-muted mr-2"></i></a>
-                                    <a href="ticket_template_details.php?ticket_template_id=<?php echo $ticket_template_id; ?>">
+                                    <a href="ticket_template.php?ticket_template_id=<?php echo $ticket_template_id; ?>">
                                         <?php echo $ticket_template_name; ?>
                                     </a>
                                 </td>
diff --git a/admin/project_templates.php b/admin/project_templates.php
index 786a2bb6..7f10dcbe 100644
--- a/admin/project_templates.php
+++ b/admin/project_templates.php
@@ -87,7 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td>
-                            <a class="text-dark" href="project_template_details.php?project_template_id=<?= $project_template_id ?>">
+                            <a class="text-dark" href="project_template.php?project_template_id=<?= $project_template_id ?>">
                                 <div class="media">
                                     <i class="fa fa-fw fa-2x fa-project-diagram mr-3"></i>
                                     <div class="media-body">
diff --git a/admin/saved_payment_methods.php b/admin/saved_payment_methods.php
index 776b6ae6..4431ecaf 100644
--- a/admin/saved_payment_methods.php
+++ b/admin/saved_payment_methods.php
@@ -38,7 +38,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <a href="/admin">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="payment_provider.php">Payment Providers</a>
+        <a href="payment_providers.php">Payment Providers</a>
     </li>
     <li class="breadcrumb-item active">Saved Payment Methods (Stripe)</li>
 </ol>
diff --git a/admin/ticket_templates.php b/admin/ticket_templates.php
index 448a3b6d..740aa53f 100644
--- a/admin/ticket_templates.php
+++ b/admin/ticket_templates.php
@@ -85,7 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
                                     <div class="media-body">
                                         <div>
-                                            <a href="ticket_template_details.php?ticket_template_id=<?= $ticket_template_id ?>">
+                                            <a href="ticket_template.php?ticket_template_id=<?= $ticket_template_id ?>">
                                                 <?= $ticket_template_name ?>
                                             </a>
                                         </div>
diff --git a/agent/client_overview.php b/agent/client_overview.php
index ffc6376b..b54aec39 100644
--- a/agent/client_overview.php
+++ b/agent/client_overview.php
@@ -790,7 +790,7 @@ $sql_asset_retired = mysqli_query(
                 </table>
                 <?php if ($session_user_role == 3) { ?>
                 <div class="card-footer p-2">
-                    <a href="../admin/audit_log.php?client=<?php echo $client_id; ?>">See More...</a>
+                    <a href="../admin/audit_logs.php?client=<?php echo $client_id; ?>">See More...</a>
                 </div>
                 <?php } ?>
             </div>
diff --git a/agent/user/user_activity.php b/agent/user/user_activity.php
index 03f52498..9f5f3b57 100644
--- a/agent/user/user_activity.php
+++ b/agent/user/user_activity.php
@@ -43,7 +43,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
     </table>
     <?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
         <div class="card-footer">
-            <a href="../../admin/audit_log.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
+            <a href="../../admin/audit_logs.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
         </div>
     <?php } ?>
 </div>
@@ -90,7 +90,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
     </table>
     <?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
         <div class="card-footer">
-            <a href="../../admin/audit_log.php?q=<?php echo escapeHtml($session_name); ?>">See More...</a>
+            <a href="../../admin/audit_logs.php?q=<?php echo escapeHtml($session_name); ?>">See More...</a>
         </div>
     <?php } ?>
 </div>