diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index 8bad4078..300ac714 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -205,7 +205,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ServiceRateID')"
+          v-if="form().showMe(this, 'LaborServiceRateID')"
           cols="12"
           sm="6"
           lg="4"
@@ -229,7 +229,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceRateId`
+                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborserviceRateId`
               )
             "
             @input="
@@ -242,7 +242,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'UserID')"
+          v-if="form().showMe(this, 'LaborUserID')"
           cols="12"
           sm="6"
           lg="4"
@@ -267,7 +267,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].userId`
+                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laboruserId`
               )
             "
             @input="
@@ -362,7 +362,8 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'PriceOverride') && !value.userIsRestrictedType
+            form().showMe(this, 'LaborPriceOverride') &&
+              !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -385,7 +386,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].priceOverride`
+                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborpriceOverride`
               )
             "
             :rules="[
@@ -504,7 +505,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ServiceRateID")) {
+      if (this.form().showMe(this, "LaborServiceRateID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborServiceRateID"),
           align: "left",
@@ -520,7 +521,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "UserID")) {
+      if (this.form().showMe(this, "LaborUserID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemLaborUserID"),
           align: "left",
@@ -568,7 +569,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "PriceOverride") &&
+        this.form().showMe(this, "LaborPriceOverride") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index 813919b1..bc7e2c19 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -345,7 +345,8 @@
 
         <v-col
           v-if="
-            form().showMe(this, 'PriceOverride') && !value.userIsRestrictedType
+            form().showMe(this, 'PartPriceOverride') &&
+              !value.userIsRestrictedType
           "
           cols="12"
           sm="6"
@@ -655,7 +656,7 @@ export default {
       }
 
       if (
-        this.form().showMe(this, "PriceOverride") &&
+        this.form().showMe(this, "PartPriceOverride") &&
         !this.value.userIsRestrictedType
       ) {
         headers.push({
diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue
index 4b73787c..5bd8a06b 100644
--- a/ayanova/src/components/work-order-item-scheduled-users.vue
+++ b/ayanova/src/components/work-order-item-scheduled-users.vue
@@ -214,7 +214,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'UserID')"
+          v-if="form().showMe(this, 'ScheduledUserID')"
           cols="12"
           sm="6"
           lg="4"
@@ -240,7 +240,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId`
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserId`
               )
             "
             @input="
@@ -253,7 +253,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'ServiceRateID')"
+          v-if="form().showMe(this, 'ScheduledUserServiceRateID')"
           cols="12"
           sm="6"
           lg="4"
@@ -279,7 +279,7 @@
             :error-messages="
               form().serverErrors(
                 this,
-                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId`
+                `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserserviceRateId`
               )
             "
             @input="
@@ -366,7 +366,7 @@ export default {
         value: "estimatedQuantity"
       });
 
-      if (this.form().showMe(this, "UserID")) {
+      if (this.form().showMe(this, "ScheduledUserID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserUserID"),
           align: "left",
@@ -374,7 +374,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "ServiceRateID")) {
+      if (this.form().showMe(this, "ScheduledUserServiceRateID")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"),
           align: "left",