diff --git a/client.php b/client.php
index 57094863..ed45eb05 100644
--- a/client.php
+++ b/client.php
@@ -244,9 +244,9 @@ $location_phone = formatPhoneNumber($location_phone);
             <a class="dropdown-item" href="post.php?export_client_pdf=<?php echo $client_id; ?>">Export PDF<br><small class="text-secondary">(without passwords)</small></a>
             <a class="dropdown-item" href="post.php?export_client_pdf=<?php echo $client_id; ?>&passwords">Export PDF<br><small class="text-secondary">(with passwords)</small></a>
             <div class="dropdown-divider"></div>
-            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
+            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#clientEditModal<?php echo $client_id; ?>">Edit</a>
             <div class="dropdown-divider"></div>
-            <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#deleteClientModal<?php echo $client_id; ?>">Delete</a>
+            <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#clientDeleteModal<?php echo $client_id; ?>">Delete</a>
           </div>
         </div>
       </div>
@@ -257,9 +257,9 @@ $location_phone = formatPhoneNumber($location_phone);
 <?php 
   
   include("client_routes.php");
-  include("edit_client_modal.php");
+  include("client_edit_modal.php");
   include("add_quick_modal.php");
-  include("delete_client_modal.php");
+  include("client_delete_modal.php");
 
   }
 
diff --git a/add_client_modal.php b/client_add_modal.php
similarity index 99%
rename from add_client_modal.php
rename to client_add_modal.php
index cf334524..880aeabf 100644
--- a/add_client_modal.php
+++ b/client_add_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addClientModal" tabindex="-1">
+<div class="modal" id="clientAddModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/delete_client_modal.php b/client_delete_modal.php
similarity index 91%
rename from delete_client_modal.php
rename to client_delete_modal.php
index 1ffa23c0..0e49a116 100644
--- a/delete_client_modal.php
+++ b/client_delete_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="deleteClientModal<?php echo $client_id; ?>" tabindex="-1">
+<div class="modal" id="clientDeleteModal<?php echo $client_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-body">
diff --git a/edit_client_modal.php b/client_edit_modal.php
similarity index 99%
rename from edit_client_modal.php
rename to client_edit_modal.php
index 64cf16cd..5a415cdb 100644
--- a/edit_client_modal.php
+++ b/client_edit_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="editClientModal<?php echo $client_id; ?>" tabindex="-1">
+<div class="modal" id="clientEditModal<?php echo $client_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/clients.php b/clients.php
index c26f37dd..05464625 100644
--- a/clients.php
+++ b/clients.php
@@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   <div class="card-header py-2">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Clients</h3>
     <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#clientAddModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
     </div>
   </div>
 
@@ -311,9 +311,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#clientEditModal<?php echo $client_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
-                  <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#deleteClientModal<?php echo $client_id; ?>">Delete</a>
+                  <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#clientDeleteModal<?php echo $client_id; ?>">Delete</a>
                 </div>
               </div>
             </td>
@@ -321,8 +321,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <?php
 
-            include("edit_client_modal.php");
-            include("delete_client_modal.php");
+            include("client_edit_modal.php");
+            include("client_delete_modal.php");
 
           }
           
@@ -335,7 +335,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   </div>
 </div>
 
-<?php include("add_client_modal.php"); ?>
+<?php include("client_add_modal.php"); ?>
 <?php include("add_quick_modal.php"); ?>
 
-<?php include("footer.php");
+<?php include("footer.php"); ?>
diff --git a/add_product_modal.php b/product_add_modal.php
similarity index 98%
rename from add_product_modal.php
rename to product_add_modal.php
index a5f80fa2..09af0260 100644
--- a/add_product_modal.php
+++ b/product_add_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="addProductModal" tabindex="-1">
+<div class="modal" id="productAddModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/edit_product_modal.php b/product_edit_modal.php
similarity index 98%
rename from edit_product_modal.php
rename to product_edit_modal.php
index b8d1f8d1..e083ef1e 100644
--- a/edit_product_modal.php
+++ b/product_edit_modal.php
@@ -1,4 +1,4 @@
-<div class="modal" id="editProductModal<?php echo $product_id; ?>" tabindex="-1">
+<div class="modal" id="productEditModal<?php echo $product_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
diff --git a/products.php b/products.php
index 236ea5f8..aa7bb374 100644
--- a/products.php
+++ b/products.php
@@ -52,7 +52,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   <div class="card-header py-2">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-box"></i> Products</h3>
     <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i> New Product</button>
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#productAddModal"><i class="fas fa-fw fa-plus"></i> New Product</button>
     </div>
   </div>
 
@@ -101,7 +101,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           ?>
           <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></td>
+            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#productEditModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></td>
             <td><?php echo $category_name; ?></td>
             <td><?php echo $product_description_display; ?></td>
             <td class="text-right"><?php echo get_currency_symbol($session_company_currency); ?> <?php echo number_format($product_price,2); ?></td>
@@ -111,7 +111,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#productEditModal<?php echo $product_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item text-danger" href="post.php?delete_product=<?php echo $product_id; ?>">Delete</a>
                 </div>
@@ -121,7 +121,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <?php
 
-          include("edit_product_modal.php");
+          include("product_edit_modal.php");
           
           }
           
@@ -136,7 +136,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php 
   
-  include("add_product_modal.php"); 
+  include("product_add_modal.php"); 
   include("add_quick_modal.php");
 
   include("footer.php");