diff --git a/promunifi/uap.go b/promunifi/uap.go
index acb56e1f..2f52e1c3 100644
--- a/promunifi/uap.go
+++ b/promunifi/uap.go
@@ -122,8 +122,8 @@ func descUAP(ns string) *uap {
 		RxBytesD:     prometheus.NewDesc(ns+"d_receive_bytes", "Receive Bytes D???", labels, nil),
 		BytesR:       prometheus.NewDesc(ns+"rate_bytes", "Transfer Rate", 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),
diff --git a/promunifi/usg.go b/promunifi/usg.go
index 479e9790..094cc2fb 100644
--- a/promunifi/usg.go
+++ b/promunifi/usg.go
@@ -66,8 +66,8 @@ func descUSG(ns string) *usg {
 		TotalRxBytes:   prometheus.NewDesc(ns+"receive_bytes_total", "Total Received Bytes", labels, nil),
 		TotalBytes:     prometheus.NewDesc(ns+"transferred_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),
 		NumDesktop:     prometheus.NewDesc(ns+"desktops", "Number of Desktops", labels, nil),
 		NumMobile:      prometheus.NewDesc(ns+"mobile", "Number of Mobiles", labels, nil),
 		NumHandheld:    prometheus.NewDesc(ns+"handheld", "Number of Handhelds", labels, nil),