diff --git a/upsc/metadata.csv b/upsc/metadata.csv
index 023a603728..81beaeed27 100644
--- a/upsc/metadata.csv
+++ b/upsc/metadata.csv
@@ -1,5 +1,5 @@
 metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name,curated_metric
-upsc.status,gauge,,,,UPS status,1,upsc,status,
+upsc.ups.status,gauge,,,,UPS status,1,upsc,status,
 upsc.battery.charge,gauge,,percent,,UPS battery charge,1,upsc,battery charge %,
 upsc.battery.charge.low,gauge,,percent,,UPS remaining battery level when UPS switches to Low Battery,1,upsc,low charge %,
 upsc.battery.charge.warning,gauge,,percent,,UPS battery level when UPS switches to Warning state,1,upsc,warn charge %,
@@ -10,4 +10,4 @@ upsc.battery.voltage.nominal,gauge,,volt,,UPS Nominal battery voltage,0,upsc,nom
 upsc.input.voltage,gauge,,volt,,UPS input voltage,0,upsc,input voltage,
 upsc.input.voltage.nominal,gauge,,volt,,UPS nominal input voltage,0,upsc,nominal input voltage,
 upsc.output.voltage,gauge,,volt,,UPS output voltage,0,upsc,output voltage,
-upsc.load,gauge,,percent,,UPS load,-1,upsc,load,
+upsc.ups.load,gauge,,percent,,UPS load,-1,upsc,load,