diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
index a5806c1c2..01e82301e 100644
--- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml
@@ -6414,15 +6414,15 @@ TDTM:
   - MONITORING
 
 
-OTKM:
+OTPM:
   guid: "109dc354-15b3-4dc5-86ff-30bb586d7d93"
-  description: "Oil tank temperature and pressure monitoring."
+  description: "Oil temperature and pressure monitoring."
   is_abstract: true
   opt_uses:
-  - oil_tank_differential_pressure_sensor
+  - oil_differential_pressure_sensor
   uses:
-  - oil_tank_temperature_sensor
-  - oil_tank_pressure_sensor
+  - oil_temperature_sensor
+  - oil_pressure_sensor
   implements:
   - MONITORING
 
diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
index f5623c29f..777a0005f 100644
--- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml
+++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml
@@ -657,7 +657,7 @@ CH_SS_DX2SWC_CHDXVSC2X_RWTM_MWDPC_REFSM2X_REFPM2X_CPC_INVIPWM2X_INVOPWM2X:
   - INVIPWM2X
   - INVOPWM2X
 
-CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTKM:
+CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTPM:
   guid: "8fcb81b4-c437-4a5b-b725-60bf4884fbec"
   description: "Chiller with supply water temperature monitoring, condenser water temperature delta monitoring, return isolation valves on condenser and chilled side, refrigerant saturation and pressure monitoring, motor input current, voltage and power monitoring, and oil tank temperature and pressure monitoring."
   is_canonical: true
@@ -674,7 +674,7 @@ CH_SS_SCHWTC_CWDT_CHWRISOVPM_CWRISOVPM_REFPM_REFSM_MIPVCM_MIPWM_CHCPC_CDCPC_OTKM
   - MIPWM
   - CHCPC
   - CDCPC
-  - OTKM
+  - OTPM
 
 ###################################
 ### Existing Non-standard Types ###
diff --git a/ontology/yaml/resources/fields/telemetry_fields.yaml b/ontology/yaml/resources/fields/telemetry_fields.yaml
index d2d68c7a5..579c2de7d 100644
--- a/ontology/yaml/resources/fields/telemetry_fields.yaml
+++ b/ontology/yaml/resources/fields/telemetry_fields.yaml
@@ -2877,13 +2877,7 @@ literals:
 - oil_pressure_sensor:
     flexible_min: 0.0
     flexible_max: 1034214.0
-- oil_tank_temperature_sensor:
-    flexible_min: 255.9259259
-    flexible_max: 422.037037
-- oil_tank_pressure_sensor:
-    flexible_min: 0.0
-    flexible_max: 1034214.0
-- oil_tank_differential_pressure_sensor:
+- oil_differential_pressure_sensor:
     flexible_min: 0.0
     flexible_max: 1034214.0
 - tank_level_status: