diff --git a/ayanova/src/views/svc-pm-item-expenses.vue b/ayanova/src/views/svc-pm-item-expenses.vue
index 9ea33cd6..3e099ddf 100644
--- a/ayanova/src/views/svc-pm-item-expenses.vue
+++ b/ayanova/src/views/svc-pm-item-expenses.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-expense-list"
-      data-list-key="WorkOrderItemExpenseDataList"
+      form-key="pm-item-expense-list"
+      data-list-key="PMItemExpenseDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemExpensesTable"
+      data-cy="PMItemExpensesTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-expense-list";
+const FORM_KEY = "pm-item-expense-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemExpense,
+      aType: window.$gz.type.PMItemExpense,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemExpense
+            window.$gz.type.PMItemExpense
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemExpense
+              ayatype: window.$gz.type.PMItemExpense
             }
           });
         } 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.WorkOrderItemExpense
+              window.$gz.type.PMItemExpense
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemExpense
+              ayatype: window.$gz.type.PMItemExpense
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiMoneyBillWave",
     title: "WorkOrderItemExpenseList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemExpense
+      ayaType: window.$gz.type.PMItemExpense
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-labors.vue b/ayanova/src/views/svc-pm-item-labors.vue
index 04cd696a..f37533f7 100644
--- a/ayanova/src/views/svc-pm-item-labors.vue
+++ b/ayanova/src/views/svc-pm-item-labors.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-labor-list"
-      data-list-key="WorkOrderItemLaborDataList"
+      form-key="pm-item-labor-list"
+      data-list-key="PMItemLaborDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemLaborsTable"
+      data-cy="PMItemLaborsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-labor-list";
+const FORM_KEY = "pm-item-labor-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemLabor,
+      aType: window.$gz.type.PMItemLabor,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemLabor
+            window.$gz.type.PMItemLabor
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
+              ayatype: window.$gz.type.PMItemLabor
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemLabor
+              window.$gz.type.PMItemLabor
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
+              ayatype: window.$gz.type.PMItemLabor
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiHammer",
     title: "WorkOrderItemLaborList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemLabor
+      ayaType: window.$gz.type.PMItemLabor
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-loans.vue b/ayanova/src/views/svc-pm-item-loans.vue
index 3aa306c8..2f876b55 100644
--- a/ayanova/src/views/svc-pm-item-loans.vue
+++ b/ayanova/src/views/svc-pm-item-loans.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-loan-list"
-      data-list-key="WorkOrderItemLoanDataList"
+      form-key="pm-item-loan-list"
+      data-list-key="PMItemLoanDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemLoansTable"
+      data-cy="PMItemLoansTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-loan-list";
+const FORM_KEY = "pm-item-loan-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemLoan,
+      aType: window.$gz.type.PMItemLoan,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemLoan
+            window.$gz.type.PMItemLoan
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemLoan
+              ayatype: window.$gz.type.PMItemLoan
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemLoan
+              window.$gz.type.PMItemLoan
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemLoan
+              ayatype: window.$gz.type.PMItemLoan
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiPlug",
     title: "WorkOrderItemLoanList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemLoan
+      ayaType: window.$gz.type.PMItemLoan
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-outside-services.vue b/ayanova/src/views/svc-pm-item-outside-services.vue
index 1b1b2bc0..8c15f410 100644
--- a/ayanova/src/views/svc-pm-item-outside-services.vue
+++ b/ayanova/src/views/svc-pm-item-outside-services.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-outside-service-list"
-      data-list-key="WorkOrderItemOutsideServiceDataList"
+      form-key="pm-item-outside-service-list"
+      data-list-key="PMItemOutsideServiceDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemOutsideServicesTable"
+      data-cy="PMItemOutsideServicesTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-outside-service-list";
+const FORM_KEY = "pm-item-outside-service-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemOutsideService,
+      aType: window.$gz.type.PMItemOutsideService,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemOutsideService
+            window.$gz.type.PMItemOutsideService
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemOutsideService
+              ayatype: window.$gz.type.PMItemOutsideService
             }
           });
         } 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.WorkOrderItemOutsideService
+              window.$gz.type.PMItemOutsideService
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemOutsideService
+              ayatype: window.$gz.type.PMItemOutsideService
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiLuggageCart",
     title: "WorkOrderItemOutsideServiceList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemOutsideService
+      ayaType: window.$gz.type.PMItemOutsideService
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-parts.vue b/ayanova/src/views/svc-pm-item-parts.vue
index 282912a9..787f9487 100644
--- a/ayanova/src/views/svc-pm-item-parts.vue
+++ b/ayanova/src/views/svc-pm-item-parts.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-part-list"
-      data-list-key="WorkOrderItemPartDataList"
+      form-key="pm-item-part-list"
+      data-list-key="PMItemPartDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemPartsTable"
+      data-cy="PMItemPartsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-part-list";
+const FORM_KEY = "pm-item-part-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemPart,
+      aType: window.$gz.type.PMItemPart,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemPart
+            window.$gz.type.PMItemPart
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemPart
+              ayatype: window.$gz.type.PMItemPart
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemPart
+              window.$gz.type.PMItemPart
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemPart
+              ayatype: window.$gz.type.PMItemPart
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiBoxes",
     title: "WorkOrderItemPartList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemPart
+      ayaType: window.$gz.type.PMItemPart
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-scheduled-users.vue b/ayanova/src/views/svc-pm-item-scheduled-users.vue
index a4aeaf1f..6e156563 100644
--- a/ayanova/src/views/svc-pm-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-pm-item-scheduled-users.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-scheduled-user-list"
-      data-list-key="WorkOrderItemScheduledUserDataList"
+      form-key="pm-item-scheduled-user-list"
+      data-list-key="PMItemScheduledUserDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemScheduledUsersTable"
+      data-cy="PMItemScheduledUsersTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-scheduled-user-list";
+const FORM_KEY = "pm-item-scheduled-user-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemScheduledUser,
+      aType: window.$gz.type.PMItemScheduledUser,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemScheduledUser
+            window.$gz.type.PMItemScheduledUser
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+              ayatype: window.$gz.type.PMItemScheduledUser
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemScheduledUser
+              window.$gz.type.PMItemScheduledUser
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+              ayatype: window.$gz.type.PMItemScheduledUser
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiUserClock",
     title: "WorkOrderItemScheduledUserList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemScheduledUser
+      ayaType: window.$gz.type.PMItemScheduledUser
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-tasks.vue b/ayanova/src/views/svc-pm-item-tasks.vue
index 715dfc9d..e24e81b1 100644
--- a/ayanova/src/views/svc-pm-item-tasks.vue
+++ b/ayanova/src/views/svc-pm-item-tasks.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-task-list"
-      data-list-key="WorkOrderItemTaskDataList"
+      form-key="pm-item-task-list"
+      data-list-key="PMItemTaskDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemTasksTable"
+      data-cy="PMItemTasksTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-task-list";
+const FORM_KEY = "pm-item-task-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemTask,
+      aType: window.$gz.type.PMItemTask,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemTask
+            window.$gz.type.PMItemTask
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemTask
+              ayatype: window.$gz.type.PMItemTask
             }
           });
         } 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.WorkOrderItemTask
+              window.$gz.type.PMItemTask
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemTask
+              ayatype: window.$gz.type.PMItemTask
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiTasks",
     title: "WorkOrderItemTasks",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemTask
+      ayaType: window.$gz.type.PMItemTask
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-travels.vue b/ayanova/src/views/svc-pm-item-travels.vue
index 0005d366..e5dd6bd0 100644
--- a/ayanova/src/views/svc-pm-item-travels.vue
+++ b/ayanova/src/views/svc-pm-item-travels.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-travel-list"
-      data-list-key="WorkOrderItemTravelDataList"
+      form-key="pm-item-travel-list"
+      data-list-key="PMItemTravelDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemTravelsTable"
+      data-cy="PMItemTravelsTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-travel-list";
+const FORM_KEY = "pm-item-travel-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemTravel,
+      aType: window.$gz.type.PMItemTravel,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemTravel
+            window.$gz.type.PMItemTravel
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
+              ayatype: window.$gz.type.PMItemTravel
             }
           });
         } 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.WorkOrderItemTravel
+              window.$gz.type.PMItemTravel
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
+              ayatype: window.$gz.type.PMItemTravel
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiTruckMonster",
     title: "WorkOrderItemTravelList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemTravel
+      ayaType: window.$gz.type.PMItemTravel
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-pm-item-units.vue b/ayanova/src/views/svc-pm-item-units.vue
index c34071ee..7aee4efc 100644
--- a/ayanova/src/views/svc-pm-item-units.vue
+++ b/ayanova/src/views/svc-pm-item-units.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="pm-item-unit-list"
+      data-list-key="PMItemUnitDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="PMItemUnitsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "pm-item-unit-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.PM);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.PMItemUnit,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "pm-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.PMItemUnit
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.PMItemUnit
             }
           });
         } else {
@@ -120,7 +120,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.PMItemUnit
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.PMItemUnit
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "PMList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-pms"
         });
         break;
-      case "WorkOrderItemList":
+      case "PMItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-pm-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiFan",
     title: "WorkOrderItemUnitList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-pms",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.PMItemUnit
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "PMList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":PMList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":PMItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-labors.vue b/ayanova/src/views/svc-quote-item-labors.vue
index 04cd696a..62ac840f 100644
--- a/ayanova/src/views/svc-quote-item-labors.vue
+++ b/ayanova/src/views/svc-quote-item-labors.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-labor-list"
-      data-list-key="WorkOrderItemLaborDataList"
+      form-key="quote-item-labor-list"
+      data-list-key="QuoteItemLaborDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemLaborsTable"
+      data-cy="QuoteItemLaborsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-labor-list";
+const FORM_KEY = "quote-item-labor-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemLabor,
+      aType: window.$gz.type.QuoteItemLabor,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemLabor
+            window.$gz.type.QuoteItemLabor
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
+              ayatype: window.$gz.type.QuoteItemLabor
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemLabor
+              window.$gz.type.QuoteItemLabor
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemLabor
+              ayatype: window.$gz.type.QuoteItemLabor
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
       case "WorkOrderItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -170,7 +170,7 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiHammer",
     title: "WorkOrderItemLaborList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
       ayaType: window.$gz.type.WorkOrderItemLabor
diff --git a/ayanova/src/views/svc-quote-item-loans.vue b/ayanova/src/views/svc-quote-item-loans.vue
index 3aa306c8..00962d0e 100644
--- a/ayanova/src/views/svc-quote-item-loans.vue
+++ b/ayanova/src/views/svc-quote-item-loans.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-loan-list"
-      data-list-key="WorkOrderItemLoanDataList"
+      form-key="quote-item-loan-list"
+      data-list-key="QuoteItemLoanDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemLoansTable"
+      data-cy="QuoteItemLoansTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-loan-list";
+const FORM_KEY = "quote-item-loan-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemLoan,
+      aType: window.$gz.type.QuoteItemLoan,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemLoan
+            window.$gz.type.QuoteItemLoan
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemLoan
+              ayatype: window.$gz.type.QuoteItemLoan
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemLoan
+              window.$gz.type.QuoteItemLoan
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemLoan
+              ayatype: window.$gz.type.QuoteItemLoan
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiPlug",
     title: "WorkOrderItemLoanList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemLoan
+      ayaType: window.$gz.type.QuoteItemLoan
     }
   };
 
@@ -219,14 +219,14 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({
     title: "WorkOrderList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-outside-services.vue b/ayanova/src/views/svc-quote-item-outside-services.vue
index 1b1b2bc0..1e4e9509 100644
--- a/ayanova/src/views/svc-quote-item-outside-services.vue
+++ b/ayanova/src/views/svc-quote-item-outside-services.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-outside-service-list"
-      data-list-key="WorkOrderItemOutsideServiceDataList"
+      form-key="quote-item-outside-service-list"
+      data-list-key="QuoteItemOutsideServiceDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemOutsideServicesTable"
+      data-cy="QuoteItemOutsideServicesTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-outside-service-list";
+const FORM_KEY = "quote-item-outside-service-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemOutsideService,
+      aType: window.$gz.type.QuoteItemOutsideService,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemOutsideService
+            window.$gz.type.QuoteItemOutsideService
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemOutsideService
+              ayatype: window.$gz.type.QuoteItemOutsideService
             }
           });
         } 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.WorkOrderItemOutsideService
+              window.$gz.type.QuoteItemOutsideService
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemOutsideService
+              ayatype: window.$gz.type.QuoteItemOutsideService
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiLuggageCart",
     title: "WorkOrderItemOutsideServiceList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemOutsideService
+      ayaType: window.$gz.type.QuoteItemOutsideService
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-parts.vue b/ayanova/src/views/svc-quote-item-parts.vue
index 282912a9..521b7df3 100644
--- a/ayanova/src/views/svc-quote-item-parts.vue
+++ b/ayanova/src/views/svc-quote-item-parts.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-part-list"
-      data-list-key="WorkOrderItemPartDataList"
+      form-key="quote-item-part-list"
+      data-list-key="QuoteItemPartDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemPartsTable"
+      data-cy="QuoteItemPartsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-part-list";
+const FORM_KEY = "quote-item-part-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemPart,
+      aType: window.$gz.type.QuoteItemPart,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemPart
+            window.$gz.type.QuoteItemPart
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemPart
+              ayatype: window.$gz.type.QuoteItemPart
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemPart
+              window.$gz.type.QuoteItemPart
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemPart
+              ayatype: window.$gz.type.QuoteItemPart
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiBoxes",
     title: "WorkOrderItemPartList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemPart
+      ayaType: window.$gz.type.QuoteItemPart
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-scheduled-users.vue b/ayanova/src/views/svc-quote-item-scheduled-users.vue
index a4aeaf1f..6f9682a7 100644
--- a/ayanova/src/views/svc-quote-item-scheduled-users.vue
+++ b/ayanova/src/views/svc-quote-item-scheduled-users.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-scheduled-user-list"
-      data-list-key="WorkOrderItemScheduledUserDataList"
+      form-key="quote-item-scheduled-user-list"
+      data-list-key="QuoteItemScheduledUserDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemScheduledUsersTable"
+      data-cy="QuoteItemScheduledUsersTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-scheduled-user-list";
+const FORM_KEY = "quote-item-scheduled-user-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemScheduledUser,
+      aType: window.$gz.type.QuoteItemScheduledUser,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemScheduledUser
+            window.$gz.type.QuoteItemScheduledUser
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+              ayatype: window.$gz.type.QuoteItemScheduledUser
             }
           });
         } else {
@@ -120,7 +120,7 @@ async function clickHandler(menuItem) {
 
           let res = await m.vm.$refs.reportSelector.open(
             m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.WorkOrderItemScheduledUser
+              window.$gz.type.QuoteItemScheduledUser
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemScheduledUser
+              ayatype: window.$gz.type.QuoteItemScheduledUser
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiUserClock",
     title: "WorkOrderItemScheduledUserList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemScheduledUser
+      ayaType: window.$gz.type.QuoteItemScheduledUser
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-tasks.vue b/ayanova/src/views/svc-quote-item-tasks.vue
index 715dfc9d..3afdaed1 100644
--- a/ayanova/src/views/svc-quote-item-tasks.vue
+++ b/ayanova/src/views/svc-quote-item-tasks.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-task-list"
-      data-list-key="WorkOrderItemTaskDataList"
+      form-key="quote-item-task-list"
+      data-list-key="QuoteItemTaskDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemTasksTable"
+      data-cy="QuoteItemTasksTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-task-list";
+const FORM_KEY = "quote-item-task-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemTask,
+      aType: window.$gz.type.QuoteItemTask,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemTask
+            window.$gz.type.QuoteItemTask
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemTask
+              ayatype: window.$gz.type.QuoteItemTask
             }
           });
         } 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.WorkOrderItemTask
+              window.$gz.type.QuoteItemTask
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemTask
+              ayatype: window.$gz.type.QuoteItemTask
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiTasks",
     title: "WorkOrderItemTasks",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemTask
+      ayaType: window.$gz.type.QuoteItemTask
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-travels.vue b/ayanova/src/views/svc-quote-item-travels.vue
index 0005d366..01a9f36b 100644
--- a/ayanova/src/views/svc-quote-item-travels.vue
+++ b/ayanova/src/views/svc-quote-item-travels.vue
@@ -9,22 +9,22 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-travel-list"
-      data-list-key="WorkOrderItemTravelDataList"
+      form-key="quote-item-travel-list"
+      data-list-key="QuoteItemTravelDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemTravelsTable"
+      data-cy="QuoteItemTravelsTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-travel-list";
+const FORM_KEY = "quote-item-travel-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemTravel,
+      aType: window.$gz.type.QuoteItemTravel,
       selectedItems: [],
       reload: false
     };
@@ -58,14 +58,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemTravel
+            window.$gz.type.QuoteItemTravel
           )
         );
         if (res && res.refresh == true) {
@@ -79,7 +79,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
+              ayatype: window.$gz.type.QuoteItemTravel
             }
           });
         } 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.WorkOrderItemTravel
+              window.$gz.type.QuoteItemTravel
             )
           );
 
@@ -104,19 +104,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemTravel
+              ayatype: window.$gz.type.QuoteItemTravel
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -137,10 +137,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiTruckMonster",
     title: "WorkOrderItemTravelList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemTravel
+      ayaType: window.$gz.type.QuoteItemTravel
     }
   };
 
@@ -184,16 +184,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });
 
diff --git a/ayanova/src/views/svc-quote-item-units.vue b/ayanova/src/views/svc-quote-item-units.vue
index c34071ee..5e6a701a 100644
--- a/ayanova/src/views/svc-quote-item-units.vue
+++ b/ayanova/src/views/svc-quote-item-units.vue
@@ -9,12 +9,12 @@
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="workorder-item-unit-list"
-      data-list-key="WorkOrderItemUnitDataList"
+      form-key="quote-item-unit-list"
+      data-list-key="QuoteItemUnitDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="WorkOrderItemUnitsTable"
+      data-cy="QuoteItemUnitsTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
       @clear-pre-filter="clearPreFilter"
@@ -24,10 +24,10 @@
 </template>
 
 <script>
-const FORM_KEY = "workorder-item-unit-list";
+const FORM_KEY = "quote-item-unit-list";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
+    this.rights = window.$gz.role.getRights(window.$gz.type.Quote);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     //------ Show all ----
     //OPTIONAL "Show All" FILTER
@@ -57,7 +57,7 @@ export default {
   data() {
     return {
       rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrderItemUnit,
+      aType: window.$gz.type.QuoteItemUnit,
       selectedItems: [],
       reload: false,
       clientCriteria: undefined,
@@ -91,14 +91,14 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "workorder-edit",
+          name: "quote-edit",
           params: { recordid: 0 }
         });
         break;
       case "extensions":
         let res = await m.vm.$refs.extensions.open(
           m.vm.$refs.gzdatatable.getDataListSelection(
-            window.$gz.type.WorkOrderItemUnit
+            window.$gz.type.QuoteItemUnit
           )
         );
         if (res && res.refresh == true) {
@@ -112,7 +112,7 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: m.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.QuoteItemUnit
             }
           });
         } else {
@@ -120,7 +120,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.QuoteItemUnit
             )
           );
 
@@ -137,19 +137,19 @@ async function clickHandler(menuItem) {
             name: "ay-report",
             params: {
               recordid: res.id,
-              ayatype: window.$gz.type.WorkOrderItemUnit
+              ayatype: window.$gz.type.QuoteItemUnit
             }
           });
         }
         break;
-      case "WorkOrderList":
+      case "QuoteList":
         m.vm.$router.push({
-          name: "svc-workorders"
+          name: "svc-quotes"
         });
         break;
-      case "WorkOrderItemList":
+      case "QuoteItemList":
         m.vm.$router.push({
-          name: "svc-workorder-items"
+          name: "svc-quote-items"
         });
         break;
 
@@ -170,10 +170,10 @@ function generateMenu(vm) {
     isMain: true,
     icon: "$ayiFan",
     title: "WorkOrderItemUnitList",
-    helpUrl: "svc-workorders",
+    helpUrl: "svc-quotes",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemUnit
+      ayaType: window.$gz.type.QuoteItemUnit
     }
   };
 
@@ -217,16 +217,16 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderList",
+    title: "QuoteList",
     icon: "$ayiTools",
-    key: FORM_KEY + ":WorkOrderList",
+    key: FORM_KEY + ":QuoteList",
     vm: vm
   });
 
   menuOptions.menuItems.push({
     title: "WorkOrderItemList",
     icon: "$ayiWrench",
-    key: FORM_KEY + ":WorkOrderItemList",
+    key: FORM_KEY + ":QuoteItemList",
     vm: vm
   });