diff --git a/components/ClientSearch.vue b/components/CustomerSearch.vue
similarity index 79%
rename from components/ClientSearch.vue
rename to components/CustomerSearch.vue
index 9feaffd..4c46535 100644
--- a/components/ClientSearch.vue
+++ b/components/CustomerSearch.vue
@@ -1,8 +1,8 @@
 <template>
-  <section :class="['client-search', darkMode ? 'section-darkmode' : 'section-lightmode']">
-    <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Client</div>
-    <pre v-if="!filtered" :class="['data', darkMode ? 'pre-darkmode' : 'pre-lightmode']">{{ clientFilter }}</pre>
-    <input v-if="filtered" v-model="clientFilter" @change="filterConfigItemList()"
+  <section :class="['customer-search', darkMode ? 'section-darkmode' : 'section-lightmode']">
+    <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Customer</div>
+    <pre v-if="!filtered" :class="['data', darkMode ? 'pre-darkmode' : 'pre-lightmode']">{{ customerFilter }}</pre>
+    <input v-if="filtered" v-model="customerFilter" @change="filterConfigItemList()"
       :class="['data', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
   </section>
 </template>
@@ -14,19 +14,19 @@ import { computed } from 'vue';
 
 const store = useStore();
 const filtered = computed(() => store.state.assetFiltered);
-const filteredTerm = computed(() => store.state.filteredAssetbyClient);
-const clientFilter = ref(store.state.filteredAssetbyClient);
+const filteredTerm = computed(() => store.state.filteredAssetbyCustomer);
+const customerFilter = ref(store.state.filteredAssetbyCustomer);
 
 const darkMode = ref(true)
 
 // update filtered term
 const updateFilterTerm = () => {
-  clientFilter.value = filteredTerm.value
+  customerFilter.value = filteredTerm.value
 }
 
 // update the filtered term in the store
 const filterConfigItemList = () => {
-  store.commit('updateAssetFilterbyClient', clientFilter.value);
+  store.commit('updateAssetFilterbyCustomer', customerFilter.value);
 }
 
 watch(filteredTerm, updateFilterTerm)
@@ -34,12 +34,12 @@ watch(filteredTerm, updateFilterTerm)
 
 <script>
 export default {
-  name: "ClientSearch",
+  name: "CustomerSearch",
 };
 </script>
 
 <style scoped>
-.client-search {
+.customer-search {
   display: flex;
   align-items: center;
   padding: 0.625em 1.875em;
diff --git a/components/server/Accounting.vue b/components/server/Accounting.vue
index b072f7d..c531d0e 100644
--- a/components/server/Accounting.vue
+++ b/components/server/Accounting.vue
@@ -2,7 +2,7 @@
     <section :class="['accounting-information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']" id="accounting">Accounting:
             <div class="asset-data">
-                <table class="data-table" id="asset-table-no-client">
+                <table class="data-table" id="asset-table-no-customer">
                     <tbody>
                         <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                             <th
@@ -34,7 +34,7 @@
                         <tr :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                             <td
                                 :class="['Action', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Action-darkmode' : 'Action-lightmode']">
-                                Client offer</td>
+                                Customer offer</td>
                             <td
                                 :class="['Date', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Date-darkmode' : 'Date-lightmode']">
                                 ...</td>
@@ -43,7 +43,7 @@
                         <tr :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                             <td
                                 :class="['Action', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Action-darkmode' : 'Action-lightmode']">
-                                Client order</td>
+                                Customer order</td>
                             <td
                                 :class="['Date', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Date-darkmode' : 'Date-lightmode']">
                                 ...</td>
diff --git a/components/server/Asset.vue b/components/server/Asset.vue
index 8e482dd..1a7a783 100644
--- a/components/server/Asset.vue
+++ b/components/server/Asset.vue
@@ -5,9 +5,9 @@
         <input v-if="editable" v-model="item.assetName" @change="updateConfigItem()"
             :class="['data', 'asset-name-input', darkMode ? 'h2-darkmode' : 'h2-lightmode', darkMode ? 'h2-input-darkmode' : 'h2-input-lightmode', 'input']">
         <div class="asset-data">
-            <div class="client-location">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+            <div class="customer-location">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                     <pre v-if="!editable"
                         :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']"> {{ item.customer }}</pre>
                     <select v-if="editable" id="customersDropDownChosenCI" v-model="item.customer"
@@ -81,9 +81,9 @@
         <input v-model="newAssetName" @change="updateAsset()"
             :class="['data', 'asset-name-input', darkMode ? 'h2-darkmode' : 'h2-lightmode', darkMode ? 'h2-input-darkmode' : 'h2-input-lightmode', 'input']">
         <div class="asset-data">
-            <div class="client-location">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+            <div class="customer-location">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                     <select id="customersDropDownChosenCI" v-model="newCustomer" @change="updateNewCustomerID()"
                         :class="[darkMode ? 'select-darkmode' : 'select-lightmode']">
                         <option v-for="cust in customers" :key="cust.primaryID">
@@ -475,7 +475,7 @@ export default {
     align-self: stretch;
 }
 
-.client-location,
+.customer-location,
 .info {
     display: flex;
     flex-direction: column;
diff --git a/components/server/AssetTable.vue b/components/server/AssetTable.vue
index bead5ef..4d268a6 100644
--- a/components/server/AssetTable.vue
+++ b/components/server/AssetTable.vue
@@ -1,6 +1,6 @@
 <template>
     <section v-if="assetSearchable" :class="['asset-search', darkMode ? 'section-darkmode' : 'section-lightmode']">
-        <div :class="['clientLabel', darkMode ? 'label-darkmode' : 'label-lightmode']">Config item</div>
+        <div :class="['customerLabel', darkMode ? 'label-darkmode' : 'label-lightmode']">Config item</div>
         <input v-model="assetSearchFilter" @change="searchConfigItem()"
             :class="['dataInput', 'input', darkMode ? 'data-darkmode' : 'data-lightmode']">
     </section>
@@ -10,8 +10,8 @@
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
-                        :class="['Client', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
-                        Client</th>
+                        :class="['Customer', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
+                        Customer</th>
                     <th
                         :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
                         Name</th>
@@ -26,7 +26,7 @@
                 <tr v-for="item in configItemList" :key="item.primaryID"
                     :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']">
                     <td
-                        :class="['Client', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
+                        :class="['Customer', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
                         {{ item.customer }}
                     </td>
                     <td
@@ -66,7 +66,7 @@ const goToChosenAsset = (id) => {
     store.commit('setChosenAsset', id);
     store.commit('changeToAsset');
 };
-const clientFilter = computed(() => store.state.filteredAssetbyClient);
+const customerFilter = computed(() => store.state.filteredAssetbyCustomer);
 const assetSearchable = computed(() => store.state.assetSearchable);
 
 const assetSearchFilter = ref('');
@@ -81,8 +81,8 @@ const updateSearchTerm = async () => {
 
 //get all config items
 const getConfigItems = async () => {
-    if (!(clientFilter.value === '')) {
-        await getFilteredConfigItemsByClient();
+    if (!(customerFilter.value === '')) {
+        await getFilteredConfigItemsByCustomer();
     } else {
         try {
             const response = await Axios.get(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/getAllConfigItems`);
@@ -93,10 +93,10 @@ const getConfigItems = async () => {
     }
 }
 
-//get all config items based on the searched client
-const getFilteredConfigItemsByClient = async () => {
+//get all config items based on the searched customer
+const getFilteredConfigItemsByCustomer = async () => {
     try {
-        const response = await Axios.get(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/getSelectedConfigItemsByClient/${clientFilter.value}`);
+        const response = await Axios.get(`https://${clientsideConfig.url}:${clientsideConfig.port}/api/getSelectedConfigItemsByCustomer/${customerFilter.value}`);
         configItemList.value = response.data;
     } catch (err) {
         console.log(err.response.statusText);
@@ -117,7 +117,7 @@ const searchConfigItem = async () => {
     }
 }
 
-watch(clientFilter, getConfigItems);
+watch(customerFilter, getConfigItems);
 watch(assetSearchable, updateSearchTerm);
 
 onMounted(async () => {
@@ -256,15 +256,15 @@ th {
     font: 700 0.875rem/1.875rem Overpass, sans-serif;
 }
 
-.Client {
+.Customer {
     width: 33.3%;
 }
 
-.Client-darkmode {
+.Customer-darkmode {
     border-right: 0.0625rem solid #000000;
 }
 
-.Client-lightmode {
+.Customer-lightmode {
     border-right: 0.0625rem solid #8e8e8e;
 }
 
@@ -319,7 +319,7 @@ th {
     letter-spacing: 0.05em;
 }
 
-.clientLabel {
+.customerLabel {
     width: 5.5625em;
     height: 1.875em;
     font-family: "Overpass";
diff --git a/components/server/AssetTableNoClient.vue b/components/server/AssetTableNoCustomer.vue
similarity index 97%
rename from components/server/AssetTableNoClient.vue
rename to components/server/AssetTableNoCustomer.vue
index 18de26f..0124550 100644
--- a/components/server/AssetTableNoClient.vue
+++ b/components/server/AssetTableNoCustomer.vue
@@ -1,7 +1,7 @@
 <template>
     <div :class="['data', darkMode ? 'div-darkmode' : 'div-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Assets:</div>
-        <table class="data-table" id="asset-table-no-client">
+        <table class="data-table" id="asset-table-no-customer">
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
@@ -40,7 +40,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "AssetTableNoClient",
+    name: "AssetTableNoCustomer",
 };
 </script>    
     
diff --git a/components/server/Client.vue b/components/server/Customer.vue
similarity index 95%
rename from components/server/Client.vue
rename to components/server/Customer.vue
index a3160c6..593872d 100644
--- a/components/server/Client.vue
+++ b/components/server/Customer.vue
@@ -1,11 +1,11 @@
 <template>
   <section :class="[darkMode ? 'section-darkmode' : 'section-lightmode']">
-    <pre :class="['title', darkMode ? 'title-darkmode' : 'title-lightmode']">Client name</pre>
-    <div class="data-field" id="client-id">
+    <pre :class="['title', darkMode ? 'title-darkmode' : 'title-lightmode']">Customer name</pre>
+    <div class="data-field" id="customer-id">
       <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">ID:</pre>
       <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
     </div>
-    <div class="client-data">
+    <div class="customer-data">
       <div class="contact">
         <pre :class="['area-title', darkMode ? 'h3-darkmode' : 'h3-lightmode']">Contact:</pre>
         <div class="data-field" id="contact-person">
@@ -59,7 +59,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-  name: "Client",
+  name: "Customer",
 };
 </script>   
     
@@ -99,7 +99,7 @@ section {
   justify-content: flex-start;
   gap: 1.25rem;
 } 
-.data-field#client-id { padding: 0.625rem 1.875rem; }
+.data-field#customer-id { padding: 0.625rem 1.875rem; }
 .data-field#street-name { flex: 3; } 
 
 .label {
@@ -135,7 +135,7 @@ pre {
 } 
 
 
-.client-data {
+.customer-data {
   display: flex;
   flex: auto;
   flex-direction: row;
diff --git a/components/server/ClientDepartment.vue b/components/server/CustomerDepartment.vue
similarity index 96%
rename from components/server/ClientDepartment.vue
rename to components/server/CustomerDepartment.vue
index 9a893e7..6bccb72 100644
--- a/components/server/ClientDepartment.vue
+++ b/components/server/CustomerDepartment.vue
@@ -6,8 +6,8 @@
             <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">ID:</pre>
             <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
         </div>
-        <div class="data-field" id="client-id">
-            <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client ID:</pre>
+        <div class="data-field" id="customer-id">
+            <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer ID:</pre>
             <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
         </div>
         <div class="data-field" id="head">
@@ -32,7 +32,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-name: "ClientDepartment",
+name: "CustomerDepartment",
 };
 </script>   
 
diff --git a/components/server/ClientDepartmentEmployeeList.vue b/components/server/CustomerDepartmentEmployeeList.vue
similarity index 96%
rename from components/server/ClientDepartmentEmployeeList.vue
rename to components/server/CustomerDepartmentEmployeeList.vue
index 760e3ff..fa2a48a 100644
--- a/components/server/ClientDepartmentEmployeeList.vue
+++ b/components/server/CustomerDepartmentEmployeeList.vue
@@ -2,7 +2,7 @@
 <template>
     <section :class="['data', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Employees:</div>
-        <table class="data-table" id="client-employee-table">
+        <table class="data-table" id="customer-employee-table">
             <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                 <th :class="['ID', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'ID-darkmode' : 'ID-lightmode']">ID</th>
                 <th :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">Name</th>
@@ -28,7 +28,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-  name: "ClientDepartmentEmployeeList",
+  name: "CustomerDepartmentEmployeeList",
 };
 </script>   
 
diff --git a/components/server/ClientDepartmentList.vue b/components/server/CustomerDepartmentList.vue
similarity index 96%
rename from components/server/ClientDepartmentList.vue
rename to components/server/CustomerDepartmentList.vue
index 8cdab7c..f4942b0 100644
--- a/components/server/ClientDepartmentList.vue
+++ b/components/server/CustomerDepartmentList.vue
@@ -1,7 +1,7 @@
 <template>
     <section :class="['data', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Departments:</div>
-        <table class="data-table" id="client-employee-table">
+        <table class="data-table" id="customer-employee-table">
             <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                 <th :class="['ID', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'ID-darkmode' : 'ID-lightmode']">ID</th>
                 <th :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">Name</th>
@@ -25,7 +25,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-  name: "ClientDepartmentList",
+  name: "CustomerDepartmentList",
 };
 </script>   
 
diff --git a/components/server/ClientEmployee.vue b/components/server/CustomerEmployee.vue
similarity index 97%
rename from components/server/ClientEmployee.vue
rename to components/server/CustomerEmployee.vue
index 3c78f12..2246e1c 100644
--- a/components/server/ClientEmployee.vue
+++ b/components/server/CustomerEmployee.vue
@@ -32,8 +32,8 @@
       </div>
     </div>
     <div class="data-group" id="employment-data">
-      <div class="data-field" id="client-id">
-        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client ID:</pre>
+      <div class="data-field" id="customer-id">
+        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer ID:</pre>
         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
       </div>
       <div class="data-field" id="department">
@@ -72,7 +72,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-  name: "ClientEmployee",
+  name: "CustomerEmployee",
 };
 </script>   
   
diff --git a/components/server/ClientEmployeeList.vue b/components/server/CustomerEmployeeList.vue
similarity index 97%
rename from components/server/ClientEmployeeList.vue
rename to components/server/CustomerEmployeeList.vue
index b522f97..0e01e18 100644
--- a/components/server/ClientEmployeeList.vue
+++ b/components/server/CustomerEmployeeList.vue
@@ -1,7 +1,7 @@
 <template>
     <section :class="['data', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Employees:</div>
-        <table class="data-table" id="client-employee-table">
+        <table class="data-table" id="customer-employee-table">
             <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                 <th :class="['ID', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'ID-darkmode' : 'ID-lightmode']">ID</th>
                 <th :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">Name</th>
@@ -27,7 +27,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-  name: "ClientEmployeeList",
+  name: "CustomerEmployeeList",
 };
 </script>   
 
diff --git a/components/server/ClientQuickAccess.vue b/components/server/CustomerQuickAccess.vue
similarity index 100%
rename from components/server/ClientQuickAccess.vue
rename to components/server/CustomerQuickAccess.vue
diff --git a/components/server/ClientTable.vue b/components/server/CustomerTable.vue
similarity index 96%
rename from components/server/ClientTable.vue
rename to components/server/CustomerTable.vue
index dbec134..20b0d0f 100644
--- a/components/server/ClientTable.vue
+++ b/components/server/CustomerTable.vue
@@ -1,6 +1,6 @@
 <template>
     <section :class="['data', darkMode ? 'section-darkmode' : 'section-lightmode']">
-        <table class="data-table" id="client-table">
+        <table class="data-table" id="customer-table">
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
@@ -33,7 +33,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "ClientTable",
+    name: "CustomerTable",
 };
 </script>
   
diff --git a/components/server/IssueSlip.vue b/components/server/IssueSlip.vue
index 297cb14..fea53c6 100644
--- a/components/server/IssueSlip.vue
+++ b/components/server/IssueSlip.vue
@@ -2,9 +2,9 @@
     <section :class="['information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <h2 :class="['issueSlip-name', darkMode ? 'h2-darkmode' : 'h2-lightmode']">ID issue slips</h2>
         <div class="issueSlip-data">
-            <div class="client">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+            <div class="customer">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                     <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                 </div>
             </div>
@@ -147,7 +147,7 @@ export default {
     align-self: stretch;
 }
 
-.client,
+.customer,
 .info {
     display: flex;
     flex-direction: column;
diff --git a/components/server/IssueSlipTable.vue b/components/server/IssueSlipTable.vue
index 51bc7bf..1dbbc00 100644
--- a/components/server/IssueSlipTable.vue
+++ b/components/server/IssueSlipTable.vue
@@ -5,8 +5,8 @@
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
-                        :class="['Client', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
-                        Client</th>
+                        :class="['Customer', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
+                        Customer</th>
                     <th
                         :class="['ID', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'ID-darkmode' : 'ID-lightmode']">
                         ID
@@ -22,7 +22,7 @@
                 <tr v-for="issueSlip in issueSlips" :key="issueSlip.primaryID"
                     :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                     <td
-                        :class="['Client', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
+                        :class="['Customer', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
                         {{ issueSlip.customer }}</td>
                     <td
                         :class="['ID', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'ID-darkmode' : 'ID-lightmode']">
@@ -149,15 +149,15 @@ th {
     font: 700 0.875rem/1.875rem Overpass, sans-serif;
 }
 
-.Client {
+.Customer {
     width: 31.6%;
 }
 
-.Client-darkmode {
+.Customer-darkmode {
     border-right: 0.0625rem solid #000000;
 }
 
-.Client-lightmode {
+.Customer-lightmode {
     border-right: 0.0625rem solid #8e8e8e;
 }
 
diff --git a/components/server/IssueSlipTableNoClient.vue b/components/server/IssueSlipTableNoClient.vue
index 54714e0..87a0501 100644
--- a/components/server/IssueSlipTableNoClient.vue
+++ b/components/server/IssueSlipTableNoClient.vue
@@ -42,7 +42,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "IssueSlipTableNoClient",
+    name: "IssueSlipTableNoCustomer",
 };
 </script>  
     
diff --git a/components/server/MaintenanceVisitsInstance.vue b/components/server/MaintenanceVisitsInstance.vue
index d8706c4..c962013 100644
--- a/components/server/MaintenanceVisitsInstance.vue
+++ b/components/server/MaintenanceVisitsInstance.vue
@@ -4,15 +4,15 @@
         <div class="maintenance-visits-instance-data">
             <div class="instanceInfo">
                 <div class="data-field" id="info">
-                    <div class="templateId-client-type" id="templateID">
+                    <div class="templateId-customer-type" id="templateID">
                         <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Template ID:</pre>
                         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                     </div>
-                    <div class="templateId-client-type" id="client">
-                        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+                    <div class="templateId-customer-type" id="customer">
+                        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                     </div>
-                    <div class="templateId-client-type" id="type">
+                    <div class="templateId-customer-type" id="type">
                         <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Type:</pre>
                         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                     </div>
@@ -136,7 +136,7 @@ export default {
 
 .maintenanceType-state-user,
 .creationDate-completionDate-timeSpent,
-.templateId-client-type {
+.templateId-customer-type {
     display: flex;
     flex-direction: row;
     align-items: center;
diff --git a/components/server/MaintenanceVisitsTemplate.vue b/components/server/MaintenanceVisitsTemplate.vue
index d7d8726..307c1cb 100644
--- a/components/server/MaintenanceVisitsTemplate.vue
+++ b/components/server/MaintenanceVisitsTemplate.vue
@@ -2,9 +2,9 @@
     <section :class="['information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <h2 :class="['maintenance-visits-template-name', darkMode ? 'h2-darkmode' : 'h2-lightmode']">Template name</h2>
         <div class="maintenance-visits-template-data">
-            <div class="client-ID-type-user">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+            <div class="customer-ID-type-user">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                     <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                 </div>
                 <div class="data-field" id="info">
@@ -152,7 +152,7 @@ export default {
     align-self: stretch;
 }
 
-.client-ID-type-user,
+.customer-ID-type-user,
 .info {
     display: flex;
     flex-direction: column;
diff --git a/components/server/MaintenanceVisitsTemplateTable.vue b/components/server/MaintenanceVisitsTemplateTable.vue
index 2ac623c..ba6467b 100644
--- a/components/server/MaintenanceVisitsTemplateTable.vue
+++ b/components/server/MaintenanceVisitsTemplateTable.vue
@@ -5,8 +5,8 @@
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
-                        :class="['Client', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
-                        Client</th>
+                        :class="['Customer', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
+                        Customer</th>
                     <th
                         :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
                         Name</th>
@@ -22,7 +22,7 @@
                 <tr v-for="template in maintenanceVisitTemplates" :key="template.checklistID"
                     :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                     <td
-                        :class="['Client', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
+                        :class="['Customer', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
                         {{ template.customer }}</td>
                     <td
                         :class="['Name', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
@@ -151,15 +151,15 @@ th {
     font: 700 0.875rem/1.875rem Overpass, sans-serif;
 }
 
-.Client {
+.Customer {
     width: 33.3%;
 }
 
-.Client-darkmode {
+.Customer-darkmode {
     border-right: 0.0625rem solid #000000;
 }
 
-.Client-lightmode {
+.Customer-lightmode {
     border-right: 0.0625rem solid #8e8e8e;
 }
 
diff --git a/components/server/MaintenanceVisitsTemplateTableNoClient.vue b/components/server/MaintenanceVisitsTemplateTableNoClient.vue
index e4dc813..1b9e07e 100644
--- a/components/server/MaintenanceVisitsTemplateTableNoClient.vue
+++ b/components/server/MaintenanceVisitsTemplateTableNoClient.vue
@@ -1,7 +1,7 @@
 <template>
     <div :class="['data', darkMode ? 'div-darkmode' : 'div-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Templates:</div>
-        <table class="data-table" id="maintenance-visits-templat-table-no-client">
+        <table class="data-table" id="maintenance-visits-templat-table-no-customer">
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
@@ -42,7 +42,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "MaintenanceVisitsTemplateTableNoClient",
+    name: "MaintenanceVisitsTemplateTableNoCustomer",
 };
 </script>
     
diff --git a/components/server/OrderingInformation.vue b/components/server/OrderingInformation.vue
index a7d932f..61ecd37 100644
--- a/components/server/OrderingInformation.vue
+++ b/components/server/OrderingInformation.vue
@@ -2,7 +2,7 @@
     <section :class="['ordering-information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']" id="ordering">Ordering information:
             <div class="asset-data">
-                <table class="data-table" id="asset-table-no-client">
+                <table class="data-table" id="asset-table-no-customer">
                     <tbody>
                         <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                             <th
diff --git a/components/server/ProductionOrdersInstance.vue b/components/server/ProductionOrdersInstance.vue
index 9794405..0b0269e 100644
--- a/components/server/ProductionOrdersInstance.vue
+++ b/components/server/ProductionOrdersInstance.vue
@@ -4,12 +4,12 @@
         <div class="production-orders-instance-data">
             <div class="instanceInfo">
                 <div class="data-field" id="info">
-                    <div class="templateId-client" id="templateID">
+                    <div class="templateId-customer" id="templateID">
                         <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Template ID:</pre>
                         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                     </div>
-                    <div class="templateId-client" id="client">
-                        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+                    <div class="templateId-customer" id="customer">
+                        <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                         <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                     </div>
                 </div>
@@ -163,7 +163,7 @@ export default {
 }
 
 .creationDate-completionDate-timeSpent,
-.templateId-client {
+.templateId-customer {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -250,7 +250,7 @@ export default {
     border-radius: 0.3125rem;
 }
 
-div#client {
+div#customer {
     padding-left: 2.9em;
 }
 
diff --git a/components/server/ProductionOrdersTemplate.vue b/components/server/ProductionOrdersTemplate.vue
index 42195d4..6d06ecb 100644
--- a/components/server/ProductionOrdersTemplate.vue
+++ b/components/server/ProductionOrdersTemplate.vue
@@ -2,9 +2,9 @@
     <section :class="['information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <h2 :class="['production-orders-template-name', darkMode ? 'h2-darkmode' : 'h2-lightmode']">Template name</h2>
         <div class="production-orders-template-data">
-            <div class="client-ID">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">Client:</pre>
+            <div class="customer-ID">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'div-darkmode' : 'div-lightmode']">Customer:</pre>
                     <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                 </div>
                 <div class="data-field" id="ID">
@@ -145,7 +145,7 @@ export default {
     align-self: stretch;
 }
 
-.client-ID,
+.customer-ID,
 .user {
     display: flex;
     flex-direction: column;
diff --git a/components/server/ProductionOrdersTemplateTable.vue b/components/server/ProductionOrdersTemplateTable.vue
index c293e60..f9a1596 100644
--- a/components/server/ProductionOrdersTemplateTable.vue
+++ b/components/server/ProductionOrdersTemplateTable.vue
@@ -5,8 +5,8 @@
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
-                        :class="['Client', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
-                        Client</th>
+                        :class="['Customer', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
+                        Customer</th>
                     <th
                         :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
                         Name</th>
@@ -19,7 +19,7 @@
                 <tr v-for="template in productionOrderTemplates" :key="template.templateID"
                     :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                     <td
-                        :class="['Client', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
+                        :class="['Customer', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
                         {{ template.customer }}</td>
                     <td
                         :class="['Name', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
@@ -144,15 +144,15 @@ th {
     font: 700 0.875rem/1.875rem Overpass, sans-serif;
 }
 
-.Client {
+.Customer {
     width: 33.3%;
 }
 
-.Client-darkmode {
+.Customer-darkmode {
     border-right: 0.0625rem solid #000000;
 }
 
-.Client-lightmode {
+.Customer-lightmode {
     border-right: 0.0625rem solid #8e8e8e;
 }
 
diff --git a/components/server/ProductionOrdersTemplateTableNoClient.vue b/components/server/ProductionOrdersTemplateTableNoClient.vue
index 01cbe48..dcbca8e 100644
--- a/components/server/ProductionOrdersTemplateTableNoClient.vue
+++ b/components/server/ProductionOrdersTemplateTableNoClient.vue
@@ -1,7 +1,7 @@
 <template>
     <div :class="['data', darkMode ? 'div-darkmode' : 'div-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Templates:</div>
-        <table class="data-table" id="production-orders-template-table-no-client">
+        <table class="data-table" id="production-orders-template-table-no-customer">
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
@@ -36,7 +36,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "ProductionOrdersTemplateTableNoClient",
+    name: "ProductionOrdersTemplateTableNoCustomer",
 };
 </script>     
     
diff --git a/components/server/SoftwareSpecifications.vue b/components/server/SoftwareSpecifications.vue
index 9f6a619..c5d8e27 100644
--- a/components/server/SoftwareSpecifications.vue
+++ b/components/server/SoftwareSpecifications.vue
@@ -3,7 +3,7 @@
         :class="['software-information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']" id="software">Software specifications:
             <div class="asset-data">
-                <table class="data-table" id="asset-table-no-client">
+                <table class="data-table" id="asset-table-no-customer">
                     <tbody>
                         <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                             <th
@@ -47,7 +47,7 @@
     <section v-if="addAssetBool" :class="['software-information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <div :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']" id="software">Software specifications:
             <div class="asset-data">
-                <table class="data-table" id="asset-table-no-client">
+                <table class="data-table" id="asset-table-no-customer">
                     <tbody>
                         <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                             <th
diff --git a/components/server/Solution.vue b/components/server/Solution.vue
index 619c235..4e93be4 100644
--- a/components/server/Solution.vue
+++ b/components/server/Solution.vue
@@ -2,9 +2,9 @@
     <section :class="['information', darkMode ? 'section-darkmode' : 'section-lightmode']">
         <h2 :class="['solution-name', darkMode ? 'h2-darkmode' : 'h2-lightmode']">Solution name</h2>
         <div class="solution-data">
-            <div class="client-asset">
-                <div class="data-field" id="client">
-                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Client:</pre>
+            <div class="customer-asset">
+                <div class="data-field" id="customer">
+                    <pre :class="['label', darkMode ? 'pre-darkmode' : 'pre-lightmode']">Customer:</pre>
                     <pre :class="['data', darkMode ? 'data-darkmode' : 'data-lightmode']">...</pre>
                 </div>
                 <div class="data-field" id="asset">
@@ -163,7 +163,7 @@ export default {
     align-self: stretch;
 }
 
-.client-asset,
+.customer-asset,
 .info {
     display: flex;
     flex-direction: column;
diff --git a/components/server/SolutionTable.vue b/components/server/SolutionTable.vue
index ccc271a..091f4a2 100644
--- a/components/server/SolutionTable.vue
+++ b/components/server/SolutionTable.vue
@@ -5,8 +5,8 @@
             <tbody>
                 <tr :class="['table-row', darkMode ? 'tr-head-darkmode' : 'tr-head-lightmode']" id="table-head">
                     <th
-                        :class="['Client', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
-                        Client</th>
+                        :class="['Customer', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
+                        Customer</th>
                     <th
                         :class="['Name', darkMode ? 'th-darkmode' : 'th-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
                         Name</th>
@@ -21,7 +21,7 @@
                 <tr v-for="sol in solutions" :key="sol.primaryID"
                     :class="['table-row', darkMode ? 'tr-darkmode' : 'tr-lightmode']" id="row-1">
                     <td
-                        :class="['Client', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Client-darkmode' : 'Client-lightmode']">
+                        :class="['Customer', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Customer-darkmode' : 'Customer-lightmode']">
                         {{ sol.customer }}</td>
                     <td
                         :class="['Name', darkMode ? 'td-darkmode' : 'td-lightmode', darkMode ? 'Name-darkmode' : 'Name-lightmode']">
@@ -149,15 +149,15 @@ th {
     font: 700 0.875rem/1.875rem Overpass, sans-serif;
 }
 
-.Client {
+.Customer {
     width: 33.3%;
 }
 
-.Client-darkmode {
+.Customer-darkmode {
     border-right: 0.0625rem solid #000000;
 }
 
-.Client-lightmode {
+.Customer-lightmode {
     border-right: 0.0625rem solid #8e8e8e;
 }
 
diff --git a/components/server/SolutionTableNoClient.vue b/components/server/SolutionTableNoClient.vue
index 7fb2c00..d657eda 100644
--- a/components/server/SolutionTableNoClient.vue
+++ b/components/server/SolutionTableNoClient.vue
@@ -41,7 +41,7 @@ const darkMode = ref(true)
 
 <script>
 export default {
-    name: "SolutionTableNoClient",
+    name: "SolutionTableNoCustomer",
 };
 </script>     
     
diff --git a/documentation/.$Datenbankmodell.drawio.bkp b/documentation/.$Datenbankmodell.drawio.bkp
index 3426917..23f325e 100644
--- a/documentation/.$Datenbankmodell.drawio.bkp
+++ b/documentation/.$Datenbankmodell.drawio.bkp
@@ -424,10 +424,10 @@
         <mxCell id="WukdXvazNq34soQIU5Al-32" value="supplierOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="300" width="140" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="WukdXvazNq34soQIU5Al-33" value="clientOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
+        <mxCell id="WukdXvazNq34soQIU5Al-33" value="customerOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="330" width="140" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="WukdXvazNq34soQIU5Al-34" value="clientOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
+        <mxCell id="WukdXvazNq34soQIU5Al-34" value="customerOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="360" width="140" height="30" as="geometry" />
         </mxCell>
         <mxCell id="WukdXvazNq34soQIU5Al-35" value="supplierOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
diff --git a/documentation/Datenbankmodell.drawio b/documentation/Datenbankmodell.drawio
index 3ada053..ff6e711 100644
--- a/documentation/Datenbankmodell.drawio
+++ b/documentation/Datenbankmodell.drawio
@@ -427,10 +427,10 @@
         <mxCell id="WukdXvazNq34soQIU5Al-32" value="supplierOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="300" width="140" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="WukdXvazNq34soQIU5Al-33" value="clientOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
+        <mxCell id="WukdXvazNq34soQIU5Al-33" value="customerOffer" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="330" width="140" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="WukdXvazNq34soQIU5Al-34" value="clientOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
+        <mxCell id="WukdXvazNq34soQIU5Al-34" value="customerOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
           <mxGeometry y="360" width="140" height="30" as="geometry" />
         </mxCell>
         <mxCell id="WukdXvazNq34soQIU5Al-35" value="supplierOrder" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="WukdXvazNq34soQIU5Al-15" vertex="1">
diff --git a/layouts/Navigationbar.vue b/layouts/Navigationbar.vue
index eb77c15..e2b0db8 100644
--- a/layouts/Navigationbar.vue
+++ b/layouts/Navigationbar.vue
@@ -52,12 +52,12 @@
             <pre v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Accounting</pre>
           </Transition>
         </router-link>
-        <router-link to="/clients" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']" id="clients-button">
-          <div class="icon" id="clients-icon">
-            <img :class="[darkMode ? 'img-darkmode' : 'img-lightmode']" loading="lazy" src="../icons/navbar-icons/Clients-Icon.svg" />
+        <router-link to="/customers" class="button" :class="[darkMode ? 'button-darkmode' : 'button-lightmode']" id="customers-button">
+          <div class="icon" id="customers-icon">
+            <img :class="[darkMode ? 'img-darkmode' : 'img-lightmode']" loading="lazy" src="/icons/navbar-icons/Customers-Icon.svg" />
           </div>
           <Transition name="fade">
-            <pre v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Clients</pre>
+            <pre v-if="isExpanded" :class="['label', darkMode ? 'label-darkmode' : 'label-lightmode']">Customers</pre>
           </Transition>
         </router-link>
       </nav>
diff --git a/pages/assets.vue b/pages/assets.vue
index 5abccfd..ac28d8d 100644
--- a/pages/assets.vue
+++ b/pages/assets.vue
@@ -4,9 +4,9 @@
       <h1 :class="[darkMode ? 'h1-darkmode' : 'h1-lightmode']" id="page-name">Assets</h1>
     </div>
     <div id="content-body">
-      <ClientSearch v-if="onAssetlist || onCustomerAssetlist" />
+      <CustomerSearch v-if="onAssetlist || onCustomerAssetlist" />
       <AssetTable v-if="onAssetlist" />
-      <AssetTableNoClient v-if="onCustomerAssetlist" />
+      <AssetTableNoCustomer v-if="onCustomerAssetlist" />
       <Asset v-if="onAsset" />
       <HardwareSpecifications v-if="onAsset" />
       <SoftwareSpecifications v-if="onAsset" />
@@ -21,9 +21,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientSearch from "../components/ClientSearch.vue";
+import CustomerSearch from "../components/CustomerSearch.vue";
 import AssetTable from "../components/server/AssetTable.vue";
-import AssetTableNoClient from "../components/server/AssetTableNoClient.vue";
+import AssetTableNoCustomer from "../components/server/AssetTableNoCustomer.vue";
 import Asset from "../components/server/Asset.vue";
 import HardwareSpecifications from "../components/server/HardwareSpecifications.vue";
 import SoftwareSpecifications from "../components/server/SoftwareSpecifications.vue";
diff --git a/pages/clients.vue b/pages/customers.vue
similarity index 53%
rename from pages/clients.vue
rename to pages/customers.vue
index 5415c6e..f621899 100644
--- a/pages/clients.vue
+++ b/pages/customers.vue
@@ -1,17 +1,17 @@
 <template>
   <section id="content">
     <div id="content-header">
-      <h1 :class="[darkMode ? 'h1-darkmode' : 'h1-lightmode']" id="page-name">Clients</h1>
+      <h1 :class="[darkMode ? 'h1-darkmode' : 'h1-lightmode']" id="page-name">Customers</h1>
     </div>
     <div id="content-body">
-      <ClientTable v-if="onCustomerlist"/>
-      <Client v-if="onCustomer"/>
-      <ClientQuickAccess v-if="onCustomer"/>
-      <ClientEmployeeList v-if="onEmployeelist"/>
-      <ClientEmployee v-if="onEmployee"/>
-      <ClientDepartmentList v-if="onDepartmentlist"/>
-      <ClientDepartment v-if="onDepartment"/>
-      <ClientDepartmentEmployeeList v-if="onDepartment"/>
+      <CustomerTable v-if="onCustomerlist"/>
+      <Customer v-if="onCustomer"/>
+      <CustomerQuickAccess v-if="onCustomer"/>
+      <CustomerEmployeeList v-if="onEmployeelist"/>
+      <CustomerEmployee v-if="onEmployee"/>
+      <CustomerDepartmentList v-if="onDepartmentlist"/>
+      <CustomerDepartment v-if="onDepartment"/>
+      <CustomerDepartmentEmployeeList v-if="onDepartment"/>
     </div>
   </section>
 </template>
@@ -20,17 +20,18 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientTable from "../components/server/ClientTable.vue";
-import Client from "../components/server/Client.vue";
-import ClientQuickAccess from "../components/server/ClientQuickAccess.vue";
-import ClientEmployeeList from "../components/server/ClientEmployeeList.vue";
-import ClientEmployee from "../components/server/ClientEmployee.vue";
-import ClientDepartmentList from '~/components/server/ClientDepartmentList.vue';
-import ClientDepartment from '~/components/server/ClientDepartment.vue';
-import ClientDepartmentEmployeeList from '~/components/server/ClientDepartmentEmployeeList.vue';
+import CustomerTable from "../components/server/CustomerTable.vue";
+import Customer from "../components/server/Customer.vue";
+import CustomerQuickAccess from "../components/server/CustomerQuickAccess.vue";
+import CustomerEmployeeList from "../components/server/CustomerEmployeeList.vue";
+import CustomerEmployee from "../components/server/CustomerEmployee.vue";
+import CustomerDepartmentList from '~/components/server/CustomerDepartmentList.vue';
+import CustomerDepartment from '~/components/server/CustomerDepartment.vue';
+import CustomerDepartmentEmployeeList from '~/components/server/CustomerDepartmentEmployeeList.vue';
 
 definePageMeta({
-  layout: 'default'
+  layout: 'default',
+  title: 'Customers'
 })
 
 const darkMode = ref(true)
@@ -46,7 +47,7 @@ const onDepartment = ref(true)
 
 <script>
 export default {
-  name: "ClientsPage",
+  name: "CustomersPage",
 }
 </script>
   
diff --git a/pages/issueSlips.vue b/pages/issueSlips.vue
index 0cac0e8..9544954 100644
--- a/pages/issueSlips.vue
+++ b/pages/issueSlips.vue
@@ -25,9 +25,9 @@
       </router-link>
     </div>
     <div id="content-body">
-      <ClientSearch v-if="onIssueSliplist || onCustomerIssueSliplist"/>
+      <CustomerSearch v-if="onIssueSliplist || onCustomerIssueSliplist"/>
       <IssueSlipTable v-if="onIssueSliplist"/>
-      <IssueSlipTableNoClient v-if="onCustomerIssueSliplist"/>
+      <IssueSlipTableNoCustomer v-if="onCustomerIssueSliplist"/>
       <IssueSlip v-if="onIssueSlip"/>
       <OrderingInformation v-if="onIssueSlip"/>
       <Accounting v-if="onIssueSlip"/>
@@ -39,9 +39,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientSearch from "../components/ClientSearch.vue";
+import CustomerSearch from "../components/CustomerSearch.vue";
 import IssueSlipTable from "../components/server/IssueSlipTable.vue";
-import IssueSlipTableNoClient from "../components/server/IssueSlipTableNoClient.vue";
+import IssueSlipTableNoCustomer from "../components/server/IssueSlipTableNoCustomer.vue";
 import IssueSlip from "../components/server/IssueSlip.vue";
 import OrderingInformation from "../components/server/OrderingInformation.vue";
 import Accounting from "../components/server/Accounting.vue";
diff --git a/pages/maintenanceVisits.vue b/pages/maintenanceVisits.vue
index c7a1d0f..c7ebfc4 100644
--- a/pages/maintenanceVisits.vue
+++ b/pages/maintenanceVisits.vue
@@ -25,9 +25,9 @@
       </router-link>
     </div>
     <div id="content-body">
-      <ClientSearch v-if="onTemplatelist || onCustomerTemplatelist"/>
+      <CustomerSearch v-if="onTemplatelist || onCustomerTemplatelist"/>
       <MaintenanceVisitsTemplateTable v-if="onTemplatelist"/>
-      <MaintenanceVisitsTemplateTableNoClient v-if="onCustomerTemplatelist"/>
+      <MaintenanceVisitsTemplateTableNoCustomer v-if="onCustomerTemplatelist"/>
       <MaintenanceVisitsTemplate v-if="onTemplate"/>
       <TemplateChecklist v-if="onTemplate"/>
       <TemplateSearch v-if="onInstancelist"/>
@@ -42,9 +42,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientSearch from "../components/ClientSearch.vue";
+import CustomerSearch from "../components/CustomerSearch.vue";
 import MaintenanceVisitsTemplateTable from "../components/server/MaintenanceVisitsTemplateTable.vue";
-import MaintenanceVisitsTemplateTableNoClient from "../components/server/MaintenanceVisitsTemplateTableNoClient.vue";
+import MaintenanceVisitsTemplateTableNoCustomer from "../components/server/MaintenanceVisitsTemplateTableNoCustomer.vue";
 import MaintenanceVisitsTemplate from "../components/server/MaintenanceVisitsTemplate.vue";
 import TemplateChecklist from "../components/server/TemplateChecklist.vue";
 import TemplateSearch from "../components/TemplateSearch.vue";
diff --git a/pages/productionOrders.vue b/pages/productionOrders.vue
index fc0e3fb..13e769e 100644
--- a/pages/productionOrders.vue
+++ b/pages/productionOrders.vue
@@ -25,9 +25,9 @@
             </router-link>
         </div>
         <div id="content-body">
-            <ClientSearch v-if="onTemplatelist || onCustomerTemplatelist"/>
+            <CustomerSearch v-if="onTemplatelist || onCustomerTemplatelist"/>
             <ProductionOrdersTemplateTable v-if="onTemplatelist"/>
-            <ProductionOrdersTemplateTableNoClient v-if="onCustomerTemplatelist"/>
+            <ProductionOrdersTemplateTableNoCustomer v-if="onCustomerTemplatelist"/>
             <ProductionOrdersTemplate v-if="onTemplate"/>
             <TemplateChecklist v-if="onTemplate"/>
             <TemplateSearch v-if="onInstancelist"/>
@@ -42,9 +42,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientSearch from "../components/ClientSearch.vue";
+import CustomerSearch from "../components/CustomerSearch.vue";
 import ProductionOrdersTemplateTable from "../components/server/ProductionOrdersTemplateTable.vue";
-import ProductionOrdersTemplateTableNoClient from "../components/server/ProductionOrdersTemplateTableNoClient.vue";
+import ProductionOrdersTemplateTableNoCustomer from "../components/server/ProductionOrdersTemplateTableNoCustomer.vue";
 import ProductionOrdersTemplate from "../components/server/ProductionOrdersTemplate.vue";
 import TemplateChecklist from "../components/server/TemplateChecklist.vue";
 import TemplateSearch from "../components/TemplateSearch.vue";
diff --git a/pages/solutions.vue b/pages/solutions.vue
index c8068f3..e08b5ef 100644
--- a/pages/solutions.vue
+++ b/pages/solutions.vue
@@ -4,9 +4,9 @@
       <h1 :class="[darkMode ? 'h1-darkmode' : 'h1-lightmode']" id="page-name">Solutions</h1>
     </div>
     <div id="content-body">
-      <ClientSearch v-if="onSolutionlist || onCustomerSolutionlist"/>
+      <CustomerSearch v-if="onSolutionlist || onCustomerSolutionlist"/>
       <SolutionTable v-if="onSolutionlist"/>
-      <SolutionTableNoClient v-if="onCustomerSolutionlist"/>
+      <SolutionTableNoCustomer v-if="onCustomerSolutionlist"/>
       <Solution v-if="onSolution"/>
       <SolutionChecklist v-if="onSolution"/>
     </div>
@@ -17,9 +17,9 @@
 <script setup>
 import { ref } from 'vue';
 
-import ClientSearch from "../components/ClientSearch.vue";
+import CustomerSearch from "../components/CustomerSearch.vue";
 import SolutionTable from "../components/server/SolutionTable.vue";
-import SolutionTableNoClient from "../components/server/SolutionTableNoClient.vue";
+import SolutionTableNoCustomer from "../components/server/SolutionTableNoCustomer.vue";
 import Solution from "../components/server/Solution.vue";
 import SolutionChecklist from "../components/server/SolutionChecklist.vue";
 
diff --git a/plugins/vuex.js b/plugins/vuex.js
index 7eb420a..af98a3e 100644
--- a/plugins/vuex.js
+++ b/plugins/vuex.js
@@ -12,7 +12,7 @@ const store = createStore({
             onAsset: false,
             onSolutionlistAsset: false,
             chosenAssetId: -1,
-            filteredAssetbyClient: '',
+            filteredAssetbyCustomer: '',
             newAsset: false,
             newAssetName: '',
             newCustomerID: '',
@@ -83,7 +83,7 @@ const store = createStore({
             state.assetSearchable = false
             state.deleteAsset = false
             state.chosenAssetId = -1
-            state.filteredAssetbyClient = ''
+            state.filteredAssetbyCustomer = ''
             state.newAsset = false
             state.newAssetName = ''
             state.newCustomerID = ''
@@ -114,8 +114,8 @@ const store = createStore({
         undoDeleteAsset(state) {
             state.deleteAsset = false
         },
-        updateAssetFilterbyClient(state, client) {
-            state.filteredAssetbyClient = client
+        updateAssetFilterbyCustomer(state, customer) {
+            state.filteredAssetbyCustomer = customer
         },
         toggleAssetSearchable(state) {
             if (state.assetSearchable == false) {
@@ -124,7 +124,7 @@ const store = createStore({
             } else {
                 state.assetSearchable = false
             }
-            state.filteredAssetbyClient = ''
+            state.filteredAssetbyCustomer = ''
         },
         addNewAsset(state) {
             state.newAsset = true
diff --git a/public/icons/navbar-icons/Clients-Icon.svg b/public/icons/navbar-icons/Customers-Icon.svg
similarity index 100%
rename from public/icons/navbar-icons/Clients-Icon.svg
rename to public/icons/navbar-icons/Customers-Icon.svg
diff --git a/router/index.js b/router/index.js
index 3958145..564fdf3 100644
--- a/router/index.js
+++ b/router/index.js
@@ -1,6 +1,6 @@
 // import { createRouter, createWebHistory } from 'vue-router';
 // import HomePage from '../pages/home.vue';
-// import ClientsPage from '../pages/clients.vue';
+// import CustomersPage from '../pages/customers.vue';
 // import LoginPage from '../pages/login.vue';
 // import AssetPage from '../pages/assets.vue';
 // import SolutionPage from '../pages/solutions.vue';
@@ -52,8 +52,8 @@
 //             component: IssuesPages
 //         },
 //         {
-//             path: '/clients',
-//             component: ClientsPage
+//             path: '/customers',
+//             component: CustomersPage
 //         },
 //         {
 //             path: '/settings',
diff --git a/server/api/getSelectedConfigItemsByClient/[id].ts b/server/api/getSelectedConfigItemsByCustomer/[id].ts
similarity index 82%
rename from server/api/getSelectedConfigItemsByClient/[id].ts
rename to server/api/getSelectedConfigItemsByCustomer/[id].ts
index 899ba8c..8b94556 100644
--- a/server/api/getSelectedConfigItemsByClient/[id].ts
+++ b/server/api/getSelectedConfigItemsByCustomer/[id].ts
@@ -1,4 +1,4 @@
-import { selectedConfigItemsByClient, errorMsg } from "../../middleware/configItems";
+import { selectedConfigItemsByCustomer, errorMsg } from "../../middleware/configItems";
 import { OutgoingMessage } from 'http';
 
 export default defineEventHandler(async (event) => {
@@ -18,5 +18,5 @@ export default defineEventHandler(async (event) => {
     }
 
     setResponseStatus(event, 200)
-    return selectedConfigItemsByClient
+    return selectedConfigItemsByCustomer
 })
diff --git a/server/middleware/configItems.ts b/server/middleware/configItems.ts
index efbd1ad..0f71383 100644
--- a/server/middleware/configItems.ts
+++ b/server/middleware/configItems.ts
@@ -5,7 +5,7 @@ import https from 'https';
 let configItems = [];
 let configItem = {};
 let errorMsg = '';
-let selectedConfigItemsByClient = [];
+let selectedConfigItemsByCustomer = [];
 let selectedConfigItemsByAsset = [];
 
 export default defineEventHandler(async (event) => {
@@ -170,16 +170,16 @@ export default defineEventHandler(async (event) => {
         }
     }
 
-    if (event.path.startsWith("/api/getSelectedConfigItemsByClient")) {
-        // get selected config items object by client from backend
-        let filteredClient = null;
+    if (event.path.startsWith("/api/getSelectedConfigItemsByCustomer")) {
+        // get selected config items object by customer from backend
+        let filteredCustomer = null;
         const path = event._path;
         const pathSegments = path.split('/');
-        filteredClient = pathSegments[pathSegments.length - 1];
+        filteredCustomer = pathSegments[pathSegments.length - 1];
 
         try {
-            let res = await axiosInstance.get(`https://${serversideConfig.url}:${serversideConfig.port}/selectedConfigItemsByCustomer/${filteredClient}`);
-            selectedConfigItemsByClient = res.data;
+            let res = await axiosInstance.get(`https://${serversideConfig.url}:${serversideConfig.port}/selectedConfigItemsByCustomer/${filteredCustomer}`);
+            selectedConfigItemsByCustomer = res.data;
         } catch (err) {
             if (axios.isAxiosError(err)) {
                 const axiosError = err as AxiosError;
@@ -235,4 +235,4 @@ export default defineEventHandler(async (event) => {
     }
 })
 
-export { configItems, configItem, selectedConfigItemsByClient, selectedConfigItemsByAsset, errorMsg };
\ No newline at end of file
+export { configItems, configItem, selectedConfigItemsByCustomer, selectedConfigItemsByAsset, errorMsg };
\ No newline at end of file