diff --git a/custom_components/hitachi_yutaki/const.py b/custom_components/hitachi_yutaki/const.py
index c193e7f..69d35a4 100644
--- a/custom_components/hitachi_yutaki/const.py
+++ b/custom_components/hitachi_yutaki/const.py
@@ -103,18 +103,20 @@
     "pump_speed": 1221,
     "dhw_temp": 1080,
     "pool_temp": 1083,
+    "compressor_current": 1214,
+    "compressor_frequency": 1212,
 }
 
 # R134a specific registers (S80 only)
 REGISTER_R134A = {
-    "discharge_temp": 1224,
-    "suction_temp": 1225,
-    "discharge_pressure": 1226,
-    "suction_pressure": 1227,
-    "frequency": 1228,
-    "valve_opening": 1229,
-    "current": 1230,
-    "retry_code": 1231,
+    "r134a_discharge_temp": 1224,
+    "r134a_suction_temp": 1225,
+    "r134a_discharge_pressure": 1226,
+    "r134a_suction_pressure": 1227,
+    "r134a_compressor_frequency": 1228,
+    "r134a_valve_opening": 1229,
+    "r134a_compressor_current": 1230,
+    "r134a_retry_code": 1231,
 }
 
 PLATFORMS = [
diff --git a/custom_components/hitachi_yutaki/sensor.py b/custom_components/hitachi_yutaki/sensor.py
index fa84cb1..cb46e8a 100644
--- a/custom_components/hitachi_yutaki/sensor.py
+++ b/custom_components/hitachi_yutaki/sensor.py
@@ -170,22 +170,22 @@ class HitachiYutakiSensorEntityDescription(SensorEntityDescription):
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     HitachiYutakiSensorEntityDescription(
-        key="r134a_frequency",
-        name="R134a Frequency",
+        key="r134a_compressor_frequency",
+        name="R134a Compressor Frequency",
         device_class=None,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
-        register_key="r134a_frequency",
+        register_key="r134a_compressor_frequency",
         model_required=UNIT_MODEL_S80,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     HitachiYutakiSensorEntityDescription(
-        key="r134a_current",
-        name="R134a Current",
+        key="r134a_compressor_current",
+        name="R134a Compressor Current",
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
-        register_key="r134a_current",
+        register_key="r134a_compressor_current",
         needs_conversion=True,
         model_required=UNIT_MODEL_S80,
         entity_category=EntityCategory.DIAGNOSTIC,