diff --git a/ayanova/src/views/svc-workorder-item-labors.vue b/ayanova/src/views/svc-workorder-item-labors.vue
index 4d99b489..9d6b1038 100644
--- a/ayanova/src/views/svc-workorder-item-labors.vue
+++ b/ayanova/src/views/svc-workorder-item-labors.vue
@@ -9,19 +9,19 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="workorder-item-labor-list"
+      data-list-key="WorkOrderItemLaborDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="WorkOrderItemLaborsTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "workorder-item-labor-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.WorkOrderItemLabor,
       selectedItems: [],
       reload: false
     };
@@ -65,7 +65,7 @@ async function clickHandler(menuItem) {
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.WorkOrderItemLabor
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemLabor
             }
           });
         } else {
@@ -87,7 +87,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemUnit
+              window.$gz.type.WorkOrderItemLabor
             )
           );
 
@@ -104,7 +104,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemLabor
             }
           });
         }
@@ -135,12 +135,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiFan",
-    title: "WorkOrderItemUnitList",
+    icon: "$ayiHammer",
+    title: "WorkOrderItemLaborList",
     helpUrl: "svc-workorders",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.WorkOrderItemLabor
     }
   };
 
diff --git a/ayanova/src/views/svc-workorder-item-loans.vue b/ayanova/src/views/svc-workorder-item-loans.vue
index 4d99b489..92bd0d53 100644
--- a/ayanova/src/views/svc-workorder-item-loans.vue
+++ b/ayanova/src/views/svc-workorder-item-loans.vue
@@ -9,19 +9,19 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="workorder-item-loan-list"
+      data-list-key="WorkOrderItemLoanDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="WorkOrderItemLoansTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "workorder-item-loan-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.WorkOrderItemLoan,
       selectedItems: [],
       reload: false
     };
@@ -65,7 +65,7 @@ async function clickHandler(menuItem) {
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.WorkOrderItemLoan
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemLoan
             }
           });
         } else {
@@ -87,7 +87,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemUnit
+              window.$gz.type.WorkOrderItemLoan
             )
           );
 
@@ -104,7 +104,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemLoan
             }
           });
         }
@@ -135,12 +135,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiFan",
-    title: "WorkOrderItemUnitList",
+    icon: "$ayiPlug",
+    title: "WorkOrderItemLoanList",
     helpUrl: "svc-workorders",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.WorkOrderItemLoan
     }
   };
 
diff --git a/ayanova/src/views/svc-workorder-item-outside-services.vue b/ayanova/src/views/svc-workorder-item-outside-services.vue
index 4d99b489..1b1b2bc0 100644
--- a/ayanova/src/views/svc-workorder-item-outside-services.vue
+++ b/ayanova/src/views/svc-workorder-item-outside-services.vue
@@ -9,19 +9,19 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="workorder-item-outside-service-list"
+      data-list-key="WorkOrderItemOutsideServiceDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="WorkOrderItemOutsideServicesTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "workorder-item-outside-service-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.WorkOrderItemOutsideService,
       selectedItems: [],
       reload: false
     };
@@ -65,7 +65,7 @@ async function clickHandler(menuItem) {
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.WorkOrderItemOutsideService
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
             }
           });
         } else {
@@ -87,7 +87,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemUnit
+              window.$gz.type.WorkOrderItemOutsideService
             )
           );
 
@@ -104,7 +104,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemOutsideService
             }
           });
         }
@@ -135,12 +135,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiFan",
-    title: "WorkOrderItemUnitList",
+    icon: "$ayiLuggageCart",
+    title: "WorkOrderItemOutsideServiceList",
     helpUrl: "svc-workorders",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.WorkOrderItemOutsideService
     }
   };
 
diff --git a/ayanova/src/views/svc-workorder-item-part-requests.vue b/ayanova/src/views/svc-workorder-item-part-requests.vue
index 4d99b489..a2d0455f 100644
--- a/ayanova/src/views/svc-workorder-item-part-requests.vue
+++ b/ayanova/src/views/svc-workorder-item-part-requests.vue
@@ -9,19 +9,19 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="workorder-item-part-request-list"
+      data-list-key="WorkOrderItemPartRequestDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="WorkOrderItemPartRequestsTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "workorder-item-part-request-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.WorkOrderItemPartRequest,
       selectedItems: [],
       reload: false
     };
@@ -65,7 +65,7 @@ async function clickHandler(menuItem) {
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.WorkOrderItemPartRequest
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemPartRequest
             }
           });
         } else {
@@ -87,7 +87,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemUnit
+              window.$gz.type.WorkOrderItemPartRequest
             )
           );
 
@@ -104,7 +104,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemPartRequest
             }
           });
         }
@@ -135,12 +135,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiFan",
-    title: "WorkOrderItemUnitList",
+    icon: "$ayiParachuteBox",
+    title: "WorkOrderItemPartRequestList",
     helpUrl: "svc-workorders",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.WorkOrderItemPartRequest
     }
   };
 
diff --git a/ayanova/src/views/svc-workorder-item-parts.vue b/ayanova/src/views/svc-workorder-item-parts.vue
index 4d99b489..36eaef66 100644
--- a/ayanova/src/views/svc-workorder-item-parts.vue
+++ b/ayanova/src/views/svc-workorder-item-parts.vue
@@ -9,19 +9,19 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="workorder-item-part-list"
+      data-list-key="WorkOrderItemPartDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="WorkOrderItemPartsTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "workorder-item-part-list";
 export default {
   created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.WorkOrderItemPart,
       selectedItems: [],
       reload: false
     };
@@ -65,7 +65,7 @@ async function clickHandler(menuItem) {
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.WorkOrderItemPart
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemPart
             }
           });
         } else {
@@ -87,7 +87,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemUnit
+              window.$gz.type.WorkOrderItemPart
             )
           );
 
@@ -104,7 +104,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.WorkOrderItemPart
             }
           });
         }
@@ -135,12 +135,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiFan",
-    title: "WorkOrderItemUnitList",
+    icon: "$ayiBoxes",
+    title: "WorkOrderItemPartList",
     helpUrl: "svc-workorders",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.WorkOrderItemPart
     }
   };