diff --git a/promunifi/clients.go b/promunifi/clients.go
index 17229a2d..ce8843ff 100644
--- a/promunifi/clients.go
+++ b/promunifi/clients.go
@@ -75,7 +75,7 @@ func descClient(ns string) *uclient {
 		WiredTxBytesR:  prometheus.NewDesc(ns+"wired_transmit_rate_bytes", "Client Wired Data Rate", labelWired, wired),
 		WiredTxPackets: prometheus.NewDesc(ns+"wired_transmit_packets_total", "Client Wired Transmit Packets", labelWired, wired),
 
-		Uptime: prometheus.NewDesc(ns+"uptime", "Client Uptime", labels, nil),
+		Uptime: prometheus.NewDesc(ns+"uptime_seconds", "Client Uptime", labels, nil),
 		/* needs more "looking into"
 		DpiStatsApp:       prometheus.NewDesc(ns+"dpi_stats_app", "Client DPI Stats App", labels, nil),
 		DpiStatsCat:       prometheus.NewDesc(ns+"dpi_stats_cat", "Client DPI Stats Cat", labels, nil),
diff --git a/promunifi/usg.go b/promunifi/usg.go
index 2a05a178..479e9790 100644
--- a/promunifi/usg.go
+++ b/promunifi/usg.go
@@ -61,7 +61,7 @@ func descUSG(ns string) *usg {
 	labelWan := append([]string{"port"}, labels...)
 
 	return &usg{
-		Uptime:         prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil),
+		Uptime:         prometheus.NewDesc(ns+"uptime_seconds", "Uptime", labels, nil),
 		TotalTxBytes:   prometheus.NewDesc(ns+"transmit_bytes_total", "Total Transmitted Bytes", labels, nil),
 		TotalRxBytes:   prometheus.NewDesc(ns+"receive_bytes_total", "Total Received Bytes", labels, nil),
 		TotalBytes:     prometheus.NewDesc(ns+"transferred_bytes_total", "Total Bytes Transferred", labels, nil),
diff --git a/promunifi/usw.go b/promunifi/usw.go
index 587fcb5a..29f77544 100644
--- a/promunifi/usw.go
+++ b/promunifi/usw.go
@@ -76,7 +76,7 @@ func descUSW(ns string) *usw {
 
 	return &usw{
 		// switch data
-		Uptime:        prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil),
+		Uptime:        prometheus.NewDesc(ns+"uptime_seconds", "Uptime", labels, nil),
 		Temperature:   prometheus.NewDesc(ns+"temperature_celsius", "Temperature", labels, nil),
 		TotalMaxPower: prometheus.NewDesc(ns+"max_power_total", "Total Max Power", labels, nil),
 		FanLevel:      prometheus.NewDesc(ns+"fan_level", "Fan Level", labels, nil),
@@ -84,8 +84,8 @@ func descUSW(ns string) *usw {
 		TotalRxBytes:  prometheus.NewDesc(ns+"bytes_rx_total", "Total Received Bytes", labels, nil),
 		TotalBytes:    prometheus.NewDesc(ns+"bytes_total", "Total Bytes Transferred", labels, nil),
 		NumSta:        prometheus.NewDesc(ns+"stations", "Number of Stations", labels, nil),
-		UserNumSta:    prometheus.NewDesc(ns+"stations_user", "Number of User Stations", labels, nil),
-		GuestNumSta:   prometheus.NewDesc(ns+"stations_guest", "Number of Guest Stations", labels, nil),
+		UserNumSta:    prometheus.NewDesc(ns+"user_stations", "Number of User Stations", labels, nil),
+		GuestNumSta:   prometheus.NewDesc(ns+"guest_stations", "Number of Guest Stations", labels, nil),
 		Loadavg1:      prometheus.NewDesc(ns+"load_average_1", "System Load Average 1 Minute", labels, nil),
 		Loadavg5:      prometheus.NewDesc(ns+"load_average_5", "System Load Average 5 Minutes", labels, nil),
 		Loadavg15:     prometheus.NewDesc(ns+"load_average_15", "System Load Average 15 Minutes", labels, nil),
@@ -113,9 +113,9 @@ func descUSW(ns string) *usw {
 		SwBytes:       prometheus.NewDesc(ns+"switch_bytes_total", "Switch Bytes Transferred Total", labels, nil),
 
 		// per-port data
-		PoeCurrent:   prometheus.NewDesc(pns+"poe_current", "POE Current", labelP, nil),
-		PoePower:     prometheus.NewDesc(pns+"poe_power", "POE Power", labelP, nil),
-		PoeVoltage:   prometheus.NewDesc(pns+"poe_voltage", "POE Voltage", labelP, nil),
+		PoeCurrent:   prometheus.NewDesc(pns+"poe_amperes", "POE Current", labelP, nil),
+		PoePower:     prometheus.NewDesc(pns+"poe_watts", "POE Power", labelP, nil),
+		PoeVoltage:   prometheus.NewDesc(pns+"poe_volts", "POE Voltage", labelP, nil),
 		RxBroadcast:  prometheus.NewDesc(pns+"receive_broadcast_total", "Receive Broadcast", labelP, nil),
 		RxBytes:      prometheus.NewDesc(pns+"receive_bytes_total", "Total Receive Bytes", labelP, nil),
 		RxBytesR:     prometheus.NewDesc(pns+"receive_rate_bytes", "Receive Bytes Rate", labelP, nil),