diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 7cf43fdc..8bad4078 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -89,7 +89,7 @@
         >
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborServiceStartDate')"
+          v-if="form().showMe(this, 'ServiceStartDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -122,7 +122,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborServiceStopDate')"
+          v-if="form().showMe(this, 'ServiceStopDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -162,7 +162,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborServiceRateQuantity')"
+          v-if="form().showMe(this, 'ServiceRateQuantity')"
           cols="12"
           sm="6"
           lg="4"
@@ -205,7 +205,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborServiceRateID')"
+          v-if="form().showMe(this, 'ServiceRateID')"
           cols="12"
           sm="6"
           lg="4"
@@ -242,7 +242,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborUserID')"
+          v-if="form().showMe(this, 'UserID')"
           cols="12"
           sm="6"
           lg="4"
@@ -280,7 +280,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborNoChargeQuantity')"
+          v-if="form().showMe(this, 'NoChargeQuantity')"
           cols="12"
           sm="6"
           lg="4"
@@ -324,8 +324,7 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID') &&
-              !value.userIsRestrictedType
+            form().showMe(this, 'TaxCodeSaleId') && !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -363,8 +362,7 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'LaborPriceOverride') &&
-              !value.userIsRestrictedType
+            form().showMe(this, 'PriceOverride') && !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -404,10 +402,7 @@
           ></gz-currency>
         </v-col>
 
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemLaborServiceDetails')"
-          cols="12"
-        >
+        <v-col v-if="form().showMe(this, 'ServiceDetails')" cols="12">
           <v-textarea
             :ref="
               `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceDetails`
@@ -485,7 +480,7 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "WorkOrderItemLaborServiceStartDate")) {
+      if (this.form().showMe(this, "ServiceStartDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceStartDate"),
           align: "right",
@@ -493,7 +488,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborServiceStopDate")) {
+      if (this.form().showMe(this, "ServiceStopDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceStopDate"),
           align: "right",
@@ -501,7 +496,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborServiceRateQuantity")) {
+      if (this.form().showMe(this, "ServiceRateQuantity")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceRateQuantity"),
           align: "right",
@@ -509,7 +504,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborServiceRateID")) {
+      if (this.form().showMe(this, "ServiceRateID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceRateID"),
           align: "left",
@@ -517,7 +512,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborServiceDetails")) {
+      if (this.form().showMe(this, "ServiceDetails")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceDetails"),
           align: "left",
@@ -525,7 +520,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborUserID")) {
+      if (this.form().showMe(this, "UserID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborUserID"),
           align: "left",
@@ -533,7 +528,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemLaborNoChargeQuantity")) {
+      if (this.form().showMe(this, "NoChargeQuantity")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborNoChargeQuantity"),
           align: "right",
@@ -573,7 +568,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "LaborPriceOverride") &&
+        this.form().showMe(this, "PriceOverride") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({
@@ -595,7 +590,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "WorkOrderItemLaborTaxRateSaleID") &&
+        this.form().showMe(this, "TaxCodeSaleId") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({