diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 300ac714..79456ac9 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, 'ServiceStartDate')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborServiceStartDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -122,7 +122,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ServiceStopDate')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborServiceStopDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -162,7 +162,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ServiceRateQuantity')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborServiceRateQuantity')"
           cols="12"
           sm="6"
           lg="4"
@@ -205,7 +205,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'LaborServiceRateID')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborServiceRateID')"
           cols="12"
           sm="6"
           lg="4"
@@ -229,7 +229,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborserviceRateId`
+                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceRateId`
               )
             "
             @input="
@@ -403,7 +403,10 @@
           ></gz-currency>
         </v-col>
 
-        <v-col v-if="form().showMe(this, 'ServiceDetails')" cols="12">
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemLaborServiceDetails')"
+          cols="12"
+        >
           <v-textarea
             :ref="
               `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceDetails`
@@ -481,7 +484,7 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "ServiceStartDate")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborServiceStartDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceStartDate"),
           align: "right",
@@ -489,7 +492,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ServiceStopDate")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborServiceStopDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceStopDate"),
           align: "right",
@@ -497,7 +500,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ServiceRateQuantity")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborServiceRateQuantity")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceRateQuantity"),
           align: "right",
@@ -505,7 +508,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "LaborServiceRateID")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborServiceRateID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceRateID"),
           align: "left",
@@ -513,7 +516,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ServiceDetails")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborServiceDetails")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceDetails"),
           align: "left",
diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index 72deb3d1..9f892d98 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -231,7 +231,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'SuggestedQuantity')"
+          v-if="form().showMe(this, 'WorkOrderItemPartSuggestedQuantity')"
           cols="12"
           sm="6"
           lg="4"
@@ -272,7 +272,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'Description')"
+          v-if="form().showMe(this, 'WorkOrderItemPartDescription')"
           cols="12"
           sm="6"
           lg="4"
@@ -307,7 +307,8 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'TaxPartSaleID') && !value.userIsRestrictedType
+            form().showMe(this, 'WorkOrderItemPartTaxPartSaleID') &&
+              !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -386,7 +387,10 @@
           ></gz-currency>
         </v-col>
 
-        <v-col v-if="form().showMe(this, 'Serials')" cols="12">
+        <v-col
+          v-if="form().showMe(this, 'PurchaseOrderItemSerialNumbers')"
+          cols="12"
+        >
           <v-textarea
             :ref="
               `Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials`
@@ -584,7 +588,7 @@ export default {
         value: "quantity"
       });
 
-      if (this.form().showMe(this, "SuggestedQuantity")) {
+      if (this.form().showMe(this, "WorkOrderItemPartSuggestedQuantity")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemPartSuggestedQuantity"),
           align: "right",
@@ -608,7 +612,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "Description")) {
+      if (this.form().showMe(this, "WorkOrderItemPartDescription")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemPartDescription"),
           align: "left",
@@ -616,7 +620,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "Serials")) {
+      if (this.form().showMe(this, "PurchaseOrderItemSerialNumbers")) {
         headers.push({
           text: this.$ay.t("PurchaseOrderItemSerialNumbers"),
           align: "left",
@@ -678,7 +682,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "TaxPartSaleID") &&
+        this.form().showMe(this, "WorkOrderItemPartTaxPartSaleID") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index e412be28..f65fb6c1 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -135,7 +135,12 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'Status')"
+          v-if="
+            form().showMe(
+              this,
+              'WorkOrderItemTaskWorkOrderItemTaskCompletionType'
+            )
+          "
           cols="12"
           sm="6"
           lg="4"
@@ -177,7 +182,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'CompletedByUserId')"
+          v-if="form().showMe(this, 'WorkOrderItemTaskUser')"
           cols="12"
           sm="6"
           lg="4"
@@ -216,7 +221,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'CompletedDate')"
+          v-if="form().showMe(this, 'WorkOrderItemTaskCompletedDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -381,7 +386,7 @@ export default {
         value: "task"
       });
 
-      if (this.form().showMe(this, "CompletedByUserId")) {
+      if (this.form().showMe(this, "WorkOrderItemTaskUser")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskUser"),
           align: "start",
@@ -389,7 +394,12 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "Status")) {
+      if (
+        this.form().showMe(
+          this,
+          "WorkOrderItemTaskWorkOrderItemTaskCompletionType"
+        )
+      ) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskWorkOrderItemTaskCompletionType"),
           align: "start",
@@ -397,7 +407,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "CompletedDate")) {
+      if (this.form().showMe(this, "WorkOrderItemTaskCompletedDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskCompletedDate"),
           align: "right",