diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index f4826f48a..1deda05ac 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -3831,59 +3831,6 @@ AHU_BYPSSPC_DX3SC_ECON_HT2SC_SFSS_SFVSC:
   - HT2SC
   - SFSS
   - SFVSC
-
-AHU_DFVSC_ZTC_RTM_DTM_HPZTC_CWDT_CO2C_OADM_FDPM_AHAC_WLDS:
-  guid: "2d143156-0001-496b-8413-a56cf51bdcf6"
-  description: "Single zone variable speed water cooled heat pump with CO2 override, after hours override and leak detection"
-  is_canonical: true
-  implements:
-  - AHU
-  - DFVSC
-  - ZTC
-  - RTM
-  - DTM
-  - HPZTC
-  - CWDT
-  - CO2C
-  - OADM
-  - FDPM
-  - AHAC
-  - SAFETY/WLDS
-
-AHU_DFVSC_ZTC_RTM_DTM_HPZTC_CWDT_CO2C_OAFC_FDPM_AHAC_WLDS:
-  guid: "f26ea3c9-14d1-46fd-b91c-2188bb52fbcd"
-  description: "Single zone variable speed water cooled heat pump with CO2 override, filter monitoring, after hours override and leak detection"
-  is_canonical: true
-  implements:
-  - AHU
-  - DFVSC
-  - ZTC
-  - RTM
-  - DTM
-  - HPZTC
-  - CWDT
-  - CO2C
-  - OAFC
-  - FDPM
-  - AHAC
-  - SAFETY/WLDS
-
-AHU_DFVSC_ZTC_RTM_DTM_HPZTC_CWDT_CO2C_OAFC_AHAC_WLDS:
-  guid: "83b4ebbd-6c0a-407b-9a22-1748b55d2894"
-  description: "Single zone variable speed water cooled heat pump with CO2 override, after hours override and leak detection"
-  is_canonical: true
-  implements:
-  - AHU
-  - DFVSC
-  - ZTC
-  - RTM
-  - DTM
-  - HPZTC
-  - CWDT
-  - CO2C
-  - OAFC
-  - AHAC
-  - SAFETY/WLDS
   
 AHU_DFVSC_ZTC_RTM_DTM_HPZTC_CWDT_CO2C_OADM_FDPM_AHAC:
   guid: "01979cce-71eb-4aba-8a96-3a1e9936870d"
@@ -4020,29 +3967,6 @@ AHU_DFFC_ZTC_CHWZTC_HWZTC_ECONZ_DTM_RTM_CO2C_AHAC:
   - ECONZ
   - AHAC
 
-AHU_RTC_RHC_FDPM_REFM_WLDS:
-  description: "AHU with return temperature and humidity control, filter monitoring, and refrigerant and water leak monitoring. "
-  guid: "0fa6f1e1-279d-44e3-a865-e9ed8cbbd7f2"
-  is_canonical: true
-  implements:
-  - AHU
-  - RTC
-  - RHC
-  - FDPM
-  - REFM
-  - SAFETY/WLDS
-
-AHU_RTC_RHC_OAFM_WLDS:
-  guid: "b5ee8bfa-4594-4a3e-bb71-99ac68e8777b"
-  description: "AHU with return temperature and humidity control, and water leak monitoring. "
-  is_canonical: true
-  implements:
-  - AHU
-  - RTC
-  - RHC
-  - OAFM
-  - SAFETY/WLDS
-
 AHU_DFSS_UV_H3X_DTC_DFVSFC_CHWVM:
   guid: "f728c3c0-68a0-41c0-9455-b3bef6ab2ea7"
   description: "AHU with discharge air/fan, chilled water valve and UV lamp operation."
diff --git a/ontology/yaml/resources/SAFETY/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/SAFETY/entity_types/ABSTRACT.yaml
index c360e181b..4ed922476 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/ABSTRACT.yaml
@@ -14,19 +14,19 @@
 
 ### ABSTRACT TYPES
 
-GASDET:
-  guid: "38f79492-74f8-4a6b-b87f-27bd9a3b8442"
+GASLA:
+  guid: "2f10c175-67ea-4624-84ec-c8ca5ac2861e"
   description: "Basic natural gas leak monitoring."
   is_abstract: true
   uses:
-  - gas_leak_detection_alarm
+  - gas_leak_alarm
 
-NHDET:
-  guid: "828db562-44c2-4c7c-b59b-6dbb45eae334"
+NHLA:
+  guid: "20a3ed1a-7854-47a2-8852-a0a792369447"
   description: "Basic ammonia gas leak monitoring"
   is_abstract: true
   uses:
-  - ammonia_leak_detection_alarm
+  - ammonia_leak_alarm
 
 H2M:
   guid: "7101fcfa-3143-467e-88a3-356259be5941"
@@ -36,13 +36,7 @@ H2M:
   - zone_air_h2_concentration_sensor
   opt_uses:
   - high_zone_air_h2_concentration_alarm
-
-WLDS:
-  guid: "6530f835-51a6-45c0-9130-382c297c2a01"
-  description: "Basic water leak monitoring."
-  is_abstract: true
-  uses:
-  - water_leak_detection_alarm
+  - failed_alarm
 
 BCM:
   guid: "3a316bed-1a5a-4a36-86bf-32743da1624c"
@@ -72,6 +66,8 @@ WLA:
   is_abstract: true
   uses:
   - water_leak_alarm
+  opt_uses:
+  - failed_alarm
 
 WLA2X:
   guid: "56b8fea6-c32a-40a2-af68-4b34913f25c0"
@@ -81,10 +77,52 @@ WLA2X:
   - water_leak_alarm_1
   - water_leak_alarm_2
 
+ASD:
+  guid: "2b92cc9e-8e78-4eb1-9aed-302174f9b712"
+  description: "Aspirating alarm monitoring."
+  is_abstract: true
+  opt_uses:
+  - master_alarm
+  - supervisor_alarm
+  - panel_alarm
+  uses:
+  - low_smoke_intensity_alarm
+  - medium_smoke_intensity_alarm
+  - fire_alarm
+
+PAS:
+  guid: "c495a70b-8389-476a-b103-dbf86ab7e478"
+  description: "Fire alarm monitoring with pre-action suppression."
+  is_abstract: true
+  opt_uses:
+  - master_alarm
+  - supervisor_alarm
+  - panel_alarm
+  uses:
+  - fire_alarm
+  - water_flowrate_status
+  - air_pressure_status
+
+FA:
+  guid: "505db344-eca2-431e-a2a2-e1002490db38"
+  description: "Fire alarm monitoring."
+  is_abstract: true
+  opt_uses:
+  - master_alarm
+  - supervisor_alarm
+  - panel_alarm
+  uses:
+  - fire_alarm
+
 FA2X:
   guid: "5010bcf9-f4c8-4884-8f5c-a6261b14699e"
-  description: "Fire alarm monitoring."
+  description: "Dual fire alarm monitoring."
   is_abstract: true
+  opt_uses:
+  - master_alarm
+  - supervisor_alarm
+  - panel_alarm
+  - gas_release_valve_status
   uses:
   - fire_alarm_1
   - fire_alarm_2
@@ -109,3 +147,33 @@ REFM:
   is_abstract: true
   implements:
   - /REFM
+
+EM:
+  guid: "7ee404e1-587e-4f7f-9722-09bad5599e70"
+  description: "Emergency alarm monitoring."
+  is_abstract: true
+  uses:
+  - emergency_alarm
+
+PM:
+  guid: "f559f8cc-aee8-4464-811f-9a699f9164b1"
+  description: "Panel alarm monitoring."
+  is_abstract: true
+  uses:
+  - panel_alarm
+
+TM:
+  guid: "34e861d6-6e6c-4dcc-9f9c-7337ff833dc0"
+  description: "Tranducer failure alarm monitoring."
+  is_abstract: true
+  uses:
+  - transducer_failed_alarm
+
+SM:
+  guid: "6386d6f6-4251-447a-a965-909f834eae33"
+  description: "Seismic alarm monitoring."
+  is_abstract: true
+  uses:
+  - seismic_alarm
+  opt_uses:
+  - failed_alarm
diff --git a/ontology/yaml/resources/SAFETY/entity_types/FACP.yaml b/ontology/yaml/resources/SAFETY/entity_types/FACP.yaml
index 2cce920da..281bcdec3 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/FACP.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/FACP.yaml
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# General Types
+########################
+### Canonical Types  ###
+########################
 
 
 FACP_STD:
@@ -26,6 +28,14 @@ FACP_STD:
   opt_uses:
   - master_alarm
 
+FACP_FA:
+  guid: "b1b7d950-a039-422d-a773-c83922e48484"
+  description: "Basic fire alarm panel."
+  is_canonical: true
+  implements:
+  - FACP
+  - FA
+
 FACP_FA2X:
   guid: "a29a1bdd-0f8c-498e-b4ed-d09789f2487c"
   description: "Fire alarm panel with 2 fire alarm alertness and a fire fault status"
@@ -33,8 +43,6 @@ FACP_FA2X:
   implements:
   - FACP
   - FA2X
-  opt_uses:
-  - panel_alarm
 
 FACP_PAS:
   guid: "34d56a9a-15ca-4921-a851-eb13c7be7dfd"
@@ -42,13 +50,7 @@ FACP_PAS:
   is_canonical: true
   implements:
   - FACP
-  uses:
-  - fire_alarm
-  - supervisor_alarm
-  - water_flowrate_status
-  - air_pressure_status
-  opt_uses:
-  - master_alarm
+  - PAS
 
 FACP_ASD:
   guid: "3f21bbad-15ad-4253-982d-fed1324543d3"
@@ -56,8 +58,4 @@ FACP_ASD:
   is_canonical: true
   implements:
   - FACP
-  opt_uses:
-  - low_smoke_intensity_alarm
-  - medium_smoke_intensity_alarm
-  - fire_alarm
-  - master_alarm
+  - ASD
diff --git a/ontology/yaml/resources/SAFETY/entity_types/FD.yaml b/ontology/yaml/resources/SAFETY/entity_types/FD.yaml
index c0e61b207..79af739b5 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/FD.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/FD.yaml
@@ -12,24 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FD_STD:
-  guid: "82d766cf-9d92-40b1-8782-16ec2fcc55b2"
+########################
+### Canonical Types  ###
+########################
+
+FD_PM:
+  guid: "9777f093-a7b6-4777-ba83-73e1970d5b18"
   description: "Basic fire damper"
   is_canonical: true
   implements:
   - FD
-  uses:
-  - damper_status
-  opt_uses:
-  - damper_command
+  - /PM
 
-FD_SD:
-  guid: "70dad00c-3334-4a77-8ce2-2d41d6a97c78"
-  description: "Basic smoke detector fire damper"
+FD_VPM:
+  guid: "815ff0a4-331e-41fb-8645-835c446dfb9b"
+  description: "Basic smoke detector fire damper with variable position control"
   is_canonical: true
   implements:
   - FD
-  - SD
-  uses:
-  - damper_percentage_sensor
-  - damper_percentage_command
+  - /VPM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/FDR.yaml b/ontology/yaml/resources/SAFETY/entity_types/FDR.yaml
index 49a77af59..3d7918a1e 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/FDR.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/FDR.yaml
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+########################
+### Canonical Types  ###
+########################
+
 FDR_STD:
   guid: "ff836c1f-7bd6-435a-a1b7-72c5c4490bae"
   description: "Typical fire door."
diff --git a/ontology/yaml/resources/SAFETY/entity_types/FSS.yaml b/ontology/yaml/resources/SAFETY/entity_types/FSS.yaml
index d1fb2f9ff..bf1d2e555 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/FSS.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/FSS.yaml
@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Canonical types
-
+########################
+### Canonical Types  ###
+########################
 
 FSS_STD:
   guid: "8aa5b639-8a44-4734-a676-31198ccd2c90"
@@ -24,13 +25,18 @@ FSS_STD:
   uses:
   - fire_alarm
 
-FSS_FA2X_GS:
-  guid: "637223a2-1c85-4ba3-b28f-ba5c96ffce9d"
-  description: "Fire Suppression System with with 2-level alarm and gas suppression."
+FSS_FA:
+  guid: "662a19c3-2126-4585-8a87-08dee72070df"
+  description: "Basic fire suppression system with single alarm."
+  is_canonical: true
+  implements:
+  - FSS
+  - FA
+
+FSS_FA2X:
+  guid: "28f45d23-b612-4da5-b8e1-1cb6dd2768f3"
+  description: "Fire suppression system with with 2-level alarm."
   is_canonical: true
   implements:
   - FSS
   - FA2X
-  uses:
-  - master_alarm
-  - gas_release_valve_status
diff --git a/ontology/yaml/resources/SAFETY/entity_types/GENERALTYPES.yaml b/ontology/yaml/resources/SAFETY/entity_types/GENERALTYPES.yaml
index 96bee9a30..ffab31f3f 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/GENERALTYPES.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/GENERALTYPES.yaml
@@ -14,13 +14,6 @@
 
 # General Types
 
-SD:
-  guid: "e6a159e2-505e-43ad-8411-382f5ee46de9"
-  description: "Smoke detector."
-  is_abstract: true
-  implements:
-  - SENSOR
-
 FACP:
   guid: "0aebbaf1-0112-453e-9eae-83d3ac962a9d"
   description: "Fire alarm control panel."
diff --git a/ontology/yaml/resources/SAFETY/entity_types/HS.yaml b/ontology/yaml/resources/SAFETY/entity_types/HS.yaml
index 09462fb8b..eab2f1bfd 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/HS.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/HS.yaml
@@ -12,22 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### ABSTRACT TYPES
+########################
+### Canonical Types  ###
+########################
 
-HS_STD:
-  guid: "502e5b54-bcfb-4d1c-beb6-35135f2cb50d"
+HS_SS:
+  guid: "240f9f62-04e9-44e5-9f36-0887feee26ad"
   description: "Standard horn strobe."
   is_canonical: true
   implements:
   - HS
-  uses:
-  - run_status
+  - SS
 
-HS_AL:
+HS_EM:
   guid: "2872bc24-2c0f-4695-b4f2-8455880e3471"
   description: "Horn strobe with alarm."
   is_canonical: true
   implements:
   - HS
-  uses:
-  - emergency_alarm
+  - EM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/LDS.yaml b/ontology/yaml/resources/SAFETY/entity_types/LDS.yaml
index d5adc03c7..8cd31b5b4 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/LDS.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/LDS.yaml
@@ -12,60 +12,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LDS_WLDS:
-  guid: "b1cbee31-2314-470b-900f-0543bd8b9021"
-  description: "Basic leak detection device."
-  is_canonical: true
-  implements:
-  - LDS
-  - WLDS
-
-LDS_WLDS_BCM:
-  guid: "e2d4f75a-d848-4653-8688-00102fbc6dee"
-  description: "Leak sensing device with broken cable status."
-  is_canonical: true
-  implements:
-  - LDS
-  - WLDS
-  - BCM
+########################
+### Canonical Types  ###
+########################
 
-LDS_BC2X:
+LDS_WLA_BC2X:
   guid: "49057696-a063-4786-87f5-6ea4ef9ee19b"
   description: "Leak sensing device with broken cable status."
   is_canonical: true
   implements:
   - LDS
-  - WLDS
+  - WLA
   - BC2X
 
-LDS_BC2X_LPA:
+LDS_WLA_BC2X_LPA:
   guid: "dd1b7b03-5246-4478-aef8-4ecdafb6d456"
   description: "Leak sensing device with broken cable status."
   is_canonical: true
   implements:
   - LDS
-  - WLDS
+  - WLA
   - BC2X
   - LPA
-  
-# General Types
-LDS_GASDET:
-  guid: "6b24e8cc-d5e3-4516-8097-54fe857ace17"
+
+LDS_GASLA:
+  guid: "eacc0d4c-a043-4379-ae0f-29ae0dbd74fe"
   description: "Basic natural gas monitoring device."
   is_canonical: true
   implements:
   - LDS
-  - GASDET
-  opt_uses:
-  - failed_alarm
+  - GASLA
 
-LDS_NHDET:
-  guid: "04b71e1e-530b-4288-8fdd-b1b5f05b13c3"
+LDS_NHLA:
+  guid: "13d018f0-dff0-44b7-b523-9d94d11ebada"
   description: "Basic ammonia gas monitoring device"
   is_canonical: true
   implements:
   - LDS
-  - NHDET
+  - NHLA
 
 LDS_H2M:
   guid: "257bc52c-0010-4c25-a402-491fd3059e15"
@@ -74,9 +58,6 @@ LDS_H2M:
   implements:
   - LDS
   - H2M
-  opt_uses:
-  - run_status
-  - failed_alarm
 
 LDS_WLA:
   guid: "3eee4387-6d06-4fdc-99d9-70cb1e780cb3"
@@ -102,23 +83,21 @@ LDS_WLA_BCM:
   - LDS
   - WLA
   - BCM
-  opt_uses:
-  - water_leak_cable_distance_sensor
-  - failed_alarm
 
-LDS_WLCC:
-  guid: "1bc59b7b-cef7-4c39-b7b2-efaae420bf9f"
-  description: "Leak detection sensor with array of leak cable-based sensors."
+LDS_WLA_WLS_BCM:
+  guid: "50f9d40a-2f88-4f62-9a82-246d1baa55bd"
+  description: "Water Leak sensing with cable distance sensor and and broken cable sensing device."
   is_canonical: true
-  uses:
-  - water_leak_detection_alarm
-  - water_leak_alarm
-  - water_leak_cable_distance_sensor
-  - broken_cable_alarm
+  implements:
+  - LDS
+  - WLA
+  - WLS
+  - BCM
 
 LDS_REFM:
   guid: "3e43f901-2d8c-4e69-9356-f755780b0f2b"
   description: "Refrigerant leak detection."
   is_canonical: true
   implements:
-    - REFM
\ No newline at end of file
+  - LDS
+  - REFM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/PA.yaml b/ontology/yaml/resources/SAFETY/entity_types/PA.yaml
index ef15a9540..2910254fa 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/PA.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/PA.yaml
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### ABSTRACT TYPES
+########################
+### Canonical Types  ###
+########################
 
-PA_STD:
-  guid: "721b187b-71e7-4b05-b0a4-b559ac1f7ae6"
+PA_PM:
+  guid: "d15cfc70-50b3-4aca-9eae-35f53e19172e"
   description: "Standard public address system."
   is_canonical: true
   implements:
   - PA
-  uses:
-  - panel_alarm
+  - PM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/RDT.yaml b/ontology/yaml/resources/SAFETY/entity_types/RDT.yaml
index 25eb60874..8d94718f6 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/RDT.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/RDT.yaml
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### ABSTRACT TYPES
+########################
+### Canonical Types  ###
+########################
 
-RDT_STD:
-  guid: "f60c35f4-9ec9-411d-ba65-b8751d0aa6ab"
+RDT_TM:
+  guid: "73a4e01d-1de7-46b1-8e9b-c6deb14b3d47"
   description: "Standard Rodent Repellent."
   is_canonical: true
   implements:
   - RDT
-  uses:
-  - transducer_failed_alarm
+  - TM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/SSS.yaml b/ontology/yaml/resources/SAFETY/entity_types/SSS.yaml
index 149592ed4..84b539804 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/SSS.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/SSS.yaml
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### ABSTRACT TYPES
+########################
+### Canonical Types  ###
+########################
 
-SSS_STD:
-  guid: "729b6568-3f7a-4add-8756-e8dbccaa2413"
+SSS_SM:
+  guid: "2ae00a7d-a11e-4c6b-851f-bc94a5d3cf6e"
   description: "Standard seismic detector."
   is_canonical: true
   implements:
   - SSS
-  uses:
-  - seismic_alarm
-  - failed_alarm
+  - SM
diff --git a/ontology/yaml/resources/SAFETY/entity_types/TANK.yaml b/ontology/yaml/resources/SAFETY/entity_types/TANK.yaml
index 35eb04a8d..5afca5a7b 100644
--- a/ontology/yaml/resources/SAFETY/entity_types/TANK.yaml
+++ b/ontology/yaml/resources/SAFETY/entity_types/TANK.yaml
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+########################
+### Canonical Types  ###
+########################
+
 TK_LM:
   guid: "9f11b022-b47f-4704-90c1-a3fb6e90b64f"
   description: "level monitoring for tanks. Like Fire hydrant tanks."
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index 459115ab0..93d2fb152 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -27,7 +27,7 @@ literals:
 - aisle_brightness_percentage_command:
     fixed_min: 0.0
     fixed_max: 100.0
-- ammonia_leak_detection_alarm:
+- ammonia_leak_alarm:
   - ACTIVE
   - INACTIVE
 - apparent_energy_accumulator:
@@ -1518,7 +1518,7 @@ literals:
 - gas_flowrate_sensor:
     fixed_min: 0.0
     flexible_max: 0.003932896
-- gas_leak_detection_alarm:
+- gas_leak_alarm:
   - ACTIVE
   - INACTIVE
 - gas_release_valve_status: