diff --git a/SeaHavenIndustries/Components/Pages/Contact/Index.razor b/SeaHavenIndustries/Components/Pages/Contact/Index.razor
index f28a3a3..fe3e773 100644
--- a/SeaHavenIndustries/Components/Pages/Contact/Index.razor
+++ b/SeaHavenIndustries/Components/Pages/Contact/Index.razor
@@ -57,9 +57,15 @@
             <div class="modal-body">
                 <div class="row">
                     <div class="col-12">
-                        <label for="exampleFormControlInput1" class="form-label">Name:</label>
+                        <label for="exampleFormControlInput1" class="form-label">First Name:</label>
                         <div class="input-group input-group-outline mt-1 mb-2">
-                            <input type="text" class="form-control" @bind="contacts.Name" />
+                            <input type="text" class="form-control" @bind="contacts.FirstName" />
+                        </div>
+                    </div>
+                    <div class="col-12">
+                        <label for="exampleFormControlInput1" class="form-label">Last Name:</label>
+                        <div class="input-group input-group-outline mt-1 mb-2">
+                            <input type="text" class="form-control" @bind="contacts.LastName" />
                         </div>
                     </div>
                     <div class="col-12">
diff --git a/SeaHavenIndustries/Components/Pages/Quotes/CreateQuotes.razor b/SeaHavenIndustries/Components/Pages/Quotes/CreateQuotes.razor
index c9707f0..b8f3b41 100644
--- a/SeaHavenIndustries/Components/Pages/Quotes/CreateQuotes.razor
+++ b/SeaHavenIndustries/Components/Pages/Quotes/CreateQuotes.razor
@@ -238,7 +238,7 @@
         var query = contactslist;
         if (!string.IsNullOrEmpty(args.Filter))
         {
-            query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower()));
+            query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
         }
         if (query != null)
         {
diff --git a/SeaHavenIndustries/Components/Pages/Quotes/QuotesDetails.razor b/SeaHavenIndustries/Components/Pages/Quotes/QuotesDetails.razor
index cf688cb..462bbfc 100644
--- a/SeaHavenIndustries/Components/Pages/Quotes/QuotesDetails.razor
+++ b/SeaHavenIndustries/Components/Pages/Quotes/QuotesDetails.razor
@@ -55,7 +55,7 @@
                                         <p class="w-50 mb-0">POC  :</p>
                                         @if (model.Contacts != null)
                                         {
-                                            <p class="w-40 mb-0">@model.Contacts.Name</p>
+                                            <p class="w-40 mb-0">@(model.Contacts.FirstName + " " + model.Contacts.LastName)</p>
                                         }
                                     </div>
                                 </div>
diff --git a/SeaHavenIndustries/Components/Pages/Quotes/QuotesPDF.razor b/SeaHavenIndustries/Components/Pages/Quotes/QuotesPDF.razor
index 450dea9..c793843 100644
--- a/SeaHavenIndustries/Components/Pages/Quotes/QuotesPDF.razor
+++ b/SeaHavenIndustries/Components/Pages/Quotes/QuotesPDF.razor
@@ -62,7 +62,7 @@
                             <p class="w-50 mb-0">
                                 POC  : @if (model.Contacts != null)
                                 {
-                                    <span class="w-50 mb-0" style="margin-left:15px">@model.Contacts.Name.</span>
+                                    <span class="w-50 mb-0" style="margin-left:15px">@(model.Contacts.FirstName + " " + model.Contacts.LastName)</span>
                                 }
                             </p>
 
diff --git a/SeaHavenIndustries/Components/Pages/Setting/AddTemplate.razor b/SeaHavenIndustries/Components/Pages/Setting/AddTemplate.razor
index be116e9..4174c7f 100644
--- a/SeaHavenIndustries/Components/Pages/Setting/AddTemplate.razor
+++ b/SeaHavenIndustries/Components/Pages/Setting/AddTemplate.razor
@@ -257,7 +257,7 @@
         var query = contactslist;
         if (!string.IsNullOrEmpty(args.Filter))
         {
-            query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower()));
+            query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
         }
         if (query != null)
         {
diff --git a/SeaHavenIndustries/Components/Pages/Setting/Templates.razor b/SeaHavenIndustries/Components/Pages/Setting/Templates.razor
index cc45b67..55483a2 100644
--- a/SeaHavenIndustries/Components/Pages/Setting/Templates.razor
+++ b/SeaHavenIndustries/Components/Pages/Setting/Templates.razor
@@ -152,7 +152,7 @@ else if (step == 2)
         var query = contactslist;
         if (!string.IsNullOrEmpty(args.Filter))
         {
-            query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower()));
+            query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
         }
         if (query != null)
         {
diff --git a/SeaHavenIndustries/Components/Pages/Setting/ViewTemplate.razor b/SeaHavenIndustries/Components/Pages/Setting/ViewTemplate.razor
index e60a0d9..f2abe7a 100644
--- a/SeaHavenIndustries/Components/Pages/Setting/ViewTemplate.razor
+++ b/SeaHavenIndustries/Components/Pages/Setting/ViewTemplate.razor
@@ -41,7 +41,7 @@
             {
                 foreach (var itm in model.WorkOrderContacts)
                 {
-                    <span class="badge badge-info me-2">@itm.POC?.Name</span>
+                    <span class="badge badge-info me-2">@((itm.POC?.FirstName + " " + itm.POC?.LastName).Trim())</span>
                 }
             }
 
@@ -227,7 +227,7 @@
         var query = contactslist;
         if (!string.IsNullOrEmpty(args.Filter))
         {
-            query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower()));
+            query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
         }
         if (query != null)
         {
diff --git a/SeaHavenIndustries/Components/Pages/Workorder/Addworkorders.razor b/SeaHavenIndustries/Components/Pages/Workorder/Addworkorders.razor
index cbdc7f5..8f641cf 100644
--- a/SeaHavenIndustries/Components/Pages/Workorder/Addworkorders.razor
+++ b/SeaHavenIndustries/Components/Pages/Workorder/Addworkorders.razor
@@ -387,8 +387,7 @@
         var query = contactslist;
         if (!string.IsNullOrEmpty(args.Filter))
         {
-            query = query.Where(c => c.Name != null &&
-                                 c.Name.ToLower().Contains(args.Filter.ToLower()));
+            query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
         }
         if (query != null)
         {
diff --git a/SeaHavenIndustries/Components/Pages/Workorder/UserViewWordOrder.razor b/SeaHavenIndustries/Components/Pages/Workorder/UserViewWordOrder.razor
index 821f144..4724f13 100644
--- a/SeaHavenIndustries/Components/Pages/Workorder/UserViewWordOrder.razor
+++ b/SeaHavenIndustries/Components/Pages/Workorder/UserViewWordOrder.razor
@@ -131,7 +131,7 @@ else
                                 {
                                     foreach (var itm in order.WorkOrderContacts)
                                     {
-                                        <span class="badge badge-info me-2">@itm.POC.Name</span>
+                                        <span class="badge badge-info me-2">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span>
                                     }
                                 }
                             </div>
diff --git a/SeaHavenIndustries/Components/Pages/Workorder/Viewworkorder.razor b/SeaHavenIndustries/Components/Pages/Workorder/Viewworkorder.razor
index 5ceea47..8f29eaf 100644
--- a/SeaHavenIndustries/Components/Pages/Workorder/Viewworkorder.razor
+++ b/SeaHavenIndustries/Components/Pages/Workorder/Viewworkorder.razor
@@ -139,7 +139,7 @@ else
                                 {
                                     foreach (var itm in order.WorkOrderContacts)
                                     {
-                                        <span class="badge badge-info me-2">@itm.POC.Name</span>
+                                        <span class="badge badge-info me-2">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span>
                                     }
                                 }
                             </div>
diff --git a/SeaHavenIndustries/Components/Pages/Workorder/WorkOrderPDF.razor b/SeaHavenIndustries/Components/Pages/Workorder/WorkOrderPDF.razor
index 91ea702..36923b4 100644
--- a/SeaHavenIndustries/Components/Pages/Workorder/WorkOrderPDF.razor
+++ b/SeaHavenIndustries/Components/Pages/Workorder/WorkOrderPDF.razor
@@ -121,7 +121,7 @@
                                                 <div class="row">
                                                     <div class="">
 
-                                                        <p class="mb-1" style="color: white !important;">POC: <span style="margin-left:15px">@itm.POC.Name</span></p>
+                                                        <p class="mb-1" style="color: white !important;">POC: <span style="margin-left:15px">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span></p>
                                                         <p class="mb-1" style="color: white !important;">Email: <span style="margin-left:15px">@itm.POC.Email</span></p>
                                                         <p class="mb-1" style="color: white !important;">Phone Number: <span style="margin-left:15px">@itm.POC.PhoneNumber</span></p>
                                                     </div>
diff --git a/SeaHavenIndustries/Data/Services/ContactService.cs b/SeaHavenIndustries/Data/Services/ContactService.cs
index d534239..ecc7351 100644
--- a/SeaHavenIndustries/Data/Services/ContactService.cs
+++ b/SeaHavenIndustries/Data/Services/ContactService.cs
@@ -24,7 +24,8 @@ namespace SeaHavenIndustries.Data.Services
                 var exist = _context.Contacts.Where(w => w.Id == contacts.Id).FirstOrDefault();
                 if (exist != null)
                 {
-                    exist.Name = contacts.Name;
+                    exist.FirstName = contacts.FirstName;
+                    exist.LastName = contacts.LastName;
                     exist.PhoneNumber = contacts.PhoneNumber;
                     exist.Email = contacts.Email;
                     _context.Update(exist);