diff --git a/ontology/yaml/resources/METERS/entity_types/WM.yaml b/ontology/yaml/resources/METERS/entity_types/WM.yaml
index b0a1a0292..13fde23ca 100644
--- a/ontology/yaml/resources/METERS/entity_types/WM.yaml
+++ b/ontology/yaml/resources/METERS/entity_types/WM.yaml
@@ -49,7 +49,7 @@ WM_STORM:
   - potable_water_volume_accumulator
   - mixing_tank_level_sensor
 
-WM_WASTE:
+WM_WASTE_NONCANONICAL_1:
   guid: "d7e4e751-bc3c-4fa6-bf6c-7c1a37843204"
   description: "Wastewater treatment system meter."
   implements:
@@ -57,6 +57,6 @@ WM_WASTE:
   is_canonical: false
   uses:
   - water_volume_accumulator
-  - mixing_tank_water_volume_accumulator
+  - mixing_water_tank_volume_accumulator
   - waste_water_volume_accumulator
   - recirculation_water_volume_accumulator
\ No newline at end of file
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index aa34d156c..3632bf352 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1344,7 +1344,7 @@ literals:
 - potable_water_volume_accumulator:
     flexible_min: 0
     flexible_max: 100000
-- mixing_tank_water_volume_accumulator:
+- mixing_water_tank_volume_accumulator:
     flexible_min: 0
     flexible_max: 100000
 - waste_water_volume_accumulator: