diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 120007cbb..5fdb60e89 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -8305,18 +8305,6 @@ DTPM:
   implements:
   - MONITORING
 
-DICM2X:
-  guid: "2fd7a31d-3c34-4455-a458-0e30fe207cea"
-  description: "Damper isolation control and monitoring. "
-  is_abstract: true
-  uses:
-  - supply_air_isolation_damper_closed_status_1
-  - supply_air_isolation_damper_open_status_1
-  - supply_air_isolation_damper_closed_status_2
-  - supply_air_isolation_damper_open_status_2
-  - supply_air_isolation_damper_command_1
-  - supply_air_isolation_damper_command_2
-
 PDSCV5X:
   guid: "58a33a88-c7a9-426a-a820-8db1a99cbd0e"
   description: "5 Pressure-dependent supply damper control for ventilation purposes (CO2 or VOC)."
@@ -8348,7 +8336,7 @@ COM4X:
   - zone_air_co_concentration_sensor_4
 
 CHWBZTC:
-  guid: "cbdecbaf-5ddb-4f77-b85f-2fbd92970a70"
+  guid: "b52fcafe-d276-4b08-b147-77b065f5a890"
   description: "Chilled water valve binary (open/closed) control."
   is_abstract: true
   implements:
@@ -8364,7 +8352,7 @@ CHWBZTC:
   - low_zone_air_temperature_alarm
 
 REFSTC2X:
-  guid: "4690aaf5-e70c-43e0-aabb-38d209b8c2aa"
+  guid: "82a2f713-a6b8-4b0b-814d-e75c5b1d0df1"
   description: "Refrigerant temperature temp control for 2 circuits."
   is_abstract: true
   opt_uses:
diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
index cff1c902b..2a74826f3 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
@@ -949,23 +949,30 @@ FAN_SS_MSM:
   - FAN
   - MSM
 
-FAN_SS_DICM2X:
+FAN_SS_NONCANONICAL_7:
   guid: "32703a5c-7cad-4eb6-9605-08e92f1d2cdd"
-  description: "Basic fan with start/stop and status with dual dampers monitoring."
-  is_canonical: true
+  description: "Non-standard type."
+  is_canonical: false
   implements:
-  - FAN
-  - SS
-  - DICM2X
-
-FAN_SS_DICM:
+    - FAN_SS
+  uses:
+  - discharge_air_isolation_damper_closed_status_1
+  - discharge_air_isolation_damper_open_status_1
+  - discharge_air_isolation_damper_closed_status_2
+  - discharge_air_isolation_damper_open_status_2
+  - discharge_air_isolation_damper_command_1
+  - discharge_air_isolation_damper_command_2
+
+FAN_SS_NONCANONICAL_8:
   guid: "812965c4-c9cf-4a1a-af34-225ff7de5159"
-  description: "Basic fan with start/stop and status with damper monitoring."
-  is_canonical: true
+  description: "Non-standard type."
+  is_canonical: false
   implements:
-  - FAN
-  - SS
-  - DICM
+    - FAN_SS
+  uses:
+  - discharge_air_isolation_damper_closed_status
+  - discharge_air_isolation_damper_command
+  - discharge_air_isolation_damper_open_status
 
 FAN_SS_VSC_INVOPWM:
   guid: "1c48e087-c973-4907-8d6e-93417da15d5b"
@@ -989,7 +996,7 @@ FAN_SS_VSC_COM4X:
   - VSC
   - COM4X
 
-FAN_SS_VSC_SSPM:
+FAN_SS_VSC_DSPM:
   guid: "28e19a83-a3ce-429e-951f-34cdecd036f3"
   description: "Basic fan with variable speed control and supply side pressure monitoring."
   is_canonical: true
@@ -997,4 +1004,4 @@ FAN_SS_VSC_SSPM:
   - FAN
   - SS
   - VSC
-  - SSPM
+  - DSPM
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index f280098fe..413830086 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -1898,6 +1898,12 @@ literals:
 - supply_air_isolation_damper_open_status:
   - OPEN
   - CLOSED
+- discharge_air_isolation_damper_closed_status:
+  - OPEN
+  - CLOSED
+- discharge_air_isolation_damper_open_status:
+  - OPEN
+  - CLOSED
 - control_status:
   - REMOTE
   - LOCAL