diff --git a/ayanova/src/views/svc-meter-reading.vue b/ayanova/src/views/svc-meter-reading.vue
index 94815e6c..fbda00d0 100644
--- a/ayanova/src/views/svc-meter-reading.vue
+++ b/ayanova/src/views/svc-meter-reading.vue
@@ -10,18 +10,28 @@
         <v-col cols="12">
           <gz-pick-list
             readonly
-            v-model="obj.customerId"
-            :aya-type="ayaTypes().Customer"
+            v-model="obj.unitId"
+            :aya-type="ayaTypes().Unit"
             show-edit-icon
-            :label="$ay.t('Customer')"
+            :label="$ay.t('Unit')"
           ></gz-pick-list>
         </v-col>
-
+        <v-col cols="12">
+          <gz-date-time-picker
+            :label="$ay.t('UnitMeterReadingMeterDate')"
+            v-model="obj.meterDate"
+            :readonly="formState.readOnly"
+            ref="meterDate"
+            data-cy="meterDate"
+            :error-messages="form().serverErrors(this, 'meterDate')"
+            @input="fieldValueChanged('meterDate')"
+          ></gz-date-time-picker>
+        </v-col>
         <v-col cols="12">
           <v-textarea
             v-model="obj.notes"
             :readonly="formState.readOnly"
-            :label="$ay.t('CustomerNoteNotes')"
+            :label="$ay.t('UnitMeterReadingDescription')"
             :error-messages="form().serverErrors(this, 'notes')"
             ref="notes"
             data-cy="notes"
@@ -30,29 +40,6 @@
             :clearable="!formState.readOnly"
           ></v-textarea>
         </v-col>
-
-        <v-col cols="12">
-          <gz-tag-picker
-            v-model="obj.tags"
-            :readonly="formState.readOnly"
-            ref="tags"
-            data-cy="tags"
-            :error-messages="form().serverErrors(this, 'tags')"
-            @input="fieldValueChanged('tags')"
-          ></gz-tag-picker>
-        </v-col>
-
-        <v-col cols="12">
-          <gz-date-time-picker
-            :label="$ay.t('CustomerNoteNoteDate')"
-            v-model="obj.noteDate"
-            :readonly="formState.readOnly"
-            ref="noteDate"
-            data-cy="noteDate"
-            :error-messages="form().serverErrors(this, 'noteDate')"
-            @input="fieldValueChanged('noteDate')"
-          ></gz-date-time-picker>
-        </v-col>
       </v-row>
     </v-form>
     <v-overlay :value="!formState.ready || formState.loading">
@@ -77,7 +64,7 @@ export default {
     try {
       await initForm(vm);
 
-      vm.rights = window.$gz.role.getRights(window.$gz.type.CustomerNote);
+      vm.rights = window.$gz.role.getRights(window.$gz.type.UnitMeterReading);
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       //id 0 means create or duplicate to new
@@ -153,7 +140,7 @@ export default {
         //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
         id: 0,
         concurrency: 0,
-        description: null,
+        notes: null,
         meter: 0,
         meterDate: window.$gz.locale.nowUTC8601String(),
         unitId: undefined,
@@ -170,7 +157,7 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.CustomerNote
+      ayaType: window.$gz.type.UnitMeterReading
     };
   },
   //WATCHERS
@@ -397,13 +384,16 @@ async function clickHandler(menuItem) {
           //last report selected is in m.id
           m.vm.$router.push({
             name: "ay-report",
-            params: { recordid: m.id, ayatype: window.$gz.type.CustomerNote }
+            params: {
+              recordid: m.id,
+              ayatype: window.$gz.type.UnitMeterReading
+            }
           });
         } else {
           //general report selector chosen
 
           let res = await m.vm.$refs.reportSelector.open({
-            AType: window.$gz.type.CustomerNote,
+            AType: window.$gz.type.UnitMeterReading,
             selectedRowIds: [m.vm.obj.id]
           });
 
@@ -418,7 +408,10 @@ async function clickHandler(menuItem) {
           //Now open the report viewer...
           m.vm.$router.push({
             name: "ay-report",
-            params: { recordid: res.id, ayatype: window.$gz.type.CustomerNote }
+            params: {
+              recordid: res.id,
+              ayatype: window.$gz.type.UnitMeterReading
+            }
           });
         }
         break;
@@ -439,10 +432,10 @@ function generateMenu(vm) {
     isMain: false,
     readOnly: vm.formState.readOnly,
     icon: "$ayiClipboard",
-    title: "CustomerNoteNotes",
+    title: "UnitMeterReadingNotes",
     helpUrl: "customer-notes",
     formData: {
-      ayaType: window.$gz.type.CustomerNote,
+      ayaType: window.$gz.type.UnitMeterReading,
       recordId: vm.$route.params.recordid
     },
     menuItems: []
@@ -517,8 +510,8 @@ async function initForm(vm) {
 //
 async function fetchTranslatedText(vm) {
   await window.$gz.translation.cacheTranslations([
-    "CustomerNoteNotes",
-    "CustomerNoteNoteDate"
+    "UnitMeterReadingNotes",
+    "UnitMeterReadingNoteDate"
   ]);
 }