diff --git a/packages/ds18b20.yaml b/packages/ds18b20.yaml
index 8e91ff62ec08c66ef3fa260e43e40ee02cd6c172..13ae488107db1a6776e6cba6640e358c2b061047 100644
--- a/packages/ds18b20.yaml
+++ b/packages/ds18b20.yaml
@@ -8,3 +8,9 @@ sensor:
   id: temperature_water
   name: "Water: Temperature"
   accuracy_decimals: 2
+
+prometheus:
+  relabel:
+    temperature_water:
+      id: temperature_water
+      name: "Water Temperature"
diff --git a/packages/yieryi3178.yaml b/packages/yieryi3178.yaml
index f5f0cd04d1c90ac0de54c8f560d12032451bc39d..fb96446be1da4255103653d1a28ed49dddd23d35 100644
--- a/packages/yieryi3178.yaml
+++ b/packages/yieryi3178.yaml
@@ -39,17 +39,17 @@ sensor:
 prometheus:
   relabel:
     yieryi3178_ec:
-      id: water_ec
+      id: ec
       name: "EC"
     yieryi3178_ph:
-      id: water_ph
+      id: ph
       name: "pH"
     yieryi3178_humidity:
-      id: water_humidity
+      id: humidity_water
       name: "Humidity (EC/pH Monitor)"
     yieryi3178_temperature:
-      id: water_temperature
+      id: temperature_water
       name: "Water Temperature"
     yieryi3178_battery:
-      id: water_battery
+      id: battery_water
       name: "Battery Level"