diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index 79ab4eef1..8a2318a37 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -2862,6 +2862,25 @@ HP3ZC:
   implements:
   - CONTROL
 
+CWSHPZC:
+  guid: "f976c1eb-4043-4234-b567-e82943653c96"
+  description: "Air-side water-source heat pump (heat rejection to condensing water) with zone temp control."
+  is_abstract: true
+  opt_uses:
+  - cooling_thermal_power_capacity
+  - discharge_air_temperature_sensor
+  - failed_discharge_air_temperature_alarm
+  - failed_zone_air_temperature_alarm
+  - high_zone_air_temperature_alarm
+  - low_zone_air_temperature_alarm
+  - zone_air_heating_temperature_setpoint
+  uses:
+  - condensing_water_circulation_pump_run_status
+  - condensing_water_circulation_pump_run_command
+  - zone_air_temperature_sensor
+  - zone_air_cooling_temperature_setpoint
+  implements:
+  - CONTROL
 
 HWDC:
   guid: "353bd503-92eb-4f72-8a82-ec1a91413f89"
@@ -5872,7 +5891,7 @@ HTWHLSTC:
 
 CAM:
   guid: "c37a0e19-19c0-4246-8a8b-f376aa089d56"
-  description: "ztc alarm monitoring based on moisture sensor on coil or in pan."
+  description: "Alarm monitoring based on moisture sensor on coil or in pan."
   is_abstract: true
   implements:
   - MONITORING
diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
index cd9a453b9..0d45bef65 100644
--- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml
@@ -4508,6 +4508,21 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_HWSC_CHWSC_SSPC_MOAFC_ECON_EDPM_RD_UV:
   - RD
   - UV
 
+AHU_FDPM_DFVSC_RTM_OADM_CAM_CWSHPZC_CWDT_CDWISOVM:
+  guid: "185ef011-7530-4e27-9981-6c9e2b5221c0"
+  description: "Single-zone AHU with water-source heat pump that rejects heat to condesing water."
+  is_canonical: true
+  implements:
+  - AHU
+  - FDPM
+  - DFVSC
+  - RTM
+  - OADM
+  - CAM
+  - CWSHPZC
+  - CWDT
+  - CDWISOVM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################
diff --git a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
index fc62b082d..3d1343ebc 100644
--- a/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/FCU.yaml
@@ -1475,6 +1475,20 @@ FCU_DFSS_RHDHC_HT2RC_DX2RC_ZTM:
   - DX2RC
   - ZTM
 
+FCU_FDPM_DFVSC_RTM_CAM_CWSHPZC_CWDT_CDWISOVM:
+  guid: "0ea0b3e6-03ac-44e2-b1e8-58d3e4737c55"
+  description: "FCU with water-source heat pump that rejects heat to condesing water."
+  is_canonical: true
+  implements:
+  - FCU
+  - FDPM
+  - DFVSC
+  - RTM
+  - CAM
+  - CWSHPZC
+  - CWDT
+  - CDWISOVM
+
 ###################################
 ### Existing Non-standard Types ###
 ###################################